diff options
| author |  Héctor Ramón <hector0193@gmail.com> | 2020-11-24 00:17:30 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2020-11-24 00:17:30 +0100 |
| commit | 5615643c5200ec98c5bb8ca992a67697d212ef5d (patch) | |
| tree | d94fda43e3c7037208caf7645f9a9313b6aa02c4 /wgpu | |
| parent | ea1a7248d257c7c9e4a1f3989e68b58a6bc0c4ff (diff) | |
| parent | 1916755b6b3f84329c3e3f3e9a4e1b6d2b4e45a4 (diff) | |
| download | iced-5615643c5200ec98c5bb8ca992a67697d212ef5d.tar.gz iced-5615643c5200ec98c5bb8ca992a67697d212ef5d.tar.bz2 iced-5615643c5200ec98c5bb8ca992a67697d212ef5d.zip | |
Merge pull request #628 from hecrj/improvement/float-border-radius
Use `f32` for `border_width` and `border_radius`
Diffstat (limited to 'wgpu')
| -rw-r--r-- | wgpu/src/shader/quad.vert | 5 | ||||
| -rw-r--r-- | wgpu/src/shader/quad.vert.spv | bin | 3372 -> 3604 bytes |
2 files changed, 5 insertions, 0 deletions
diff --git a/wgpu/src/shader/quad.vert b/wgpu/src/shader/quad.vert index 1d9a4fd2..09a278b1 100644 --- a/wgpu/src/shader/quad.vert +++ b/wgpu/src/shader/quad.vert @@ -24,6 +24,11 @@ void main() { vec2 p_Pos = i_Pos * u_Scale; vec2 p_Scale = i_Scale * u_Scale; + float i_BorderRadius = min( + i_BorderRadius, + min(i_Scale.x, i_Scale.y) / 2.0 + ); + mat4 i_Transform = mat4( vec4(p_Scale.x + 1.0, 0.0, 0.0, 0.0), vec4(0.0, p_Scale.y + 1.0, 0.0, 0.0), diff --git a/wgpu/src/shader/quad.vert.spv b/wgpu/src/shader/quad.vert.spv Binary files differindex 7059b51b..fa71ba1e 100644 --- a/wgpu/src/shader/quad.vert.spv +++ b/wgpu/src/shader/quad.vert.spv |