diff options
author | 2019-12-31 21:35:42 +0100 | |
---|---|---|
committer | 2019-12-31 21:38:52 +0100 | |
commit | 9ab7c47dc7d834ee73bc068f9f34eea4d6946436 (patch) | |
tree | ea52e51ffef12208a47fe29299c70095ad403957 /wgpu/src/shader/quad.vert | |
parent | 649d72e7de88e593255075957e65414ed1b4d0d6 (diff) | |
download | iced-9ab7c47dc7d834ee73bc068f9f34eea4d6946436.tar.gz iced-9ab7c47dc7d834ee73bc068f9f34eea4d6946436.tar.bz2 iced-9ab7c47dc7d834ee73bc068f9f34eea4d6946436.zip |
Add `border_width` and `border_color` to `Quad`
Diffstat (limited to '')
-rw-r--r-- | wgpu/src/shader/quad.vert | 14 | ||||
-rw-r--r-- | wgpu/src/shader/quad.vert.spv | bin | 3020 -> 3372 bytes |
2 files changed, 10 insertions, 4 deletions
diff --git a/wgpu/src/shader/quad.vert b/wgpu/src/shader/quad.vert index 539755cb..1d9a4fd2 100644 --- a/wgpu/src/shader/quad.vert +++ b/wgpu/src/shader/quad.vert @@ -4,7 +4,9 @@ layout(location = 0) in vec2 v_Pos; layout(location = 1) in vec2 i_Pos; layout(location = 2) in vec2 i_Scale; layout(location = 3) in vec4 i_Color; -layout(location = 4) in float i_BorderRadius; +layout(location = 4) in vec4 i_BorderColor; +layout(location = 5) in float i_BorderRadius; +layout(location = 6) in float i_BorderWidth; layout (set = 0, binding = 0) uniform Globals { mat4 u_Transform; @@ -12,9 +14,11 @@ layout (set = 0, binding = 0) uniform Globals { }; layout(location = 0) out vec4 o_Color; -layout(location = 1) out vec2 o_Pos; -layout(location = 2) out vec2 o_Scale; -layout(location = 3) out float o_BorderRadius; +layout(location = 1) out vec4 o_BorderColor; +layout(location = 2) out vec2 o_Pos; +layout(location = 3) out vec2 o_Scale; +layout(location = 4) out float o_BorderRadius; +layout(location = 5) out float o_BorderWidth; void main() { vec2 p_Pos = i_Pos * u_Scale; @@ -28,9 +32,11 @@ void main() { ); o_Color = i_Color; + o_BorderColor = i_BorderColor; o_Pos = p_Pos; o_Scale = p_Scale; o_BorderRadius = i_BorderRadius * u_Scale; + o_BorderWidth = i_BorderWidth * u_Scale; gl_Position = u_Transform * i_Transform * vec4(v_Pos, 0.0, 1.0); } diff --git a/wgpu/src/shader/quad.vert.spv b/wgpu/src/shader/quad.vert.spv Binary files differindex 9050adfb..7059b51b 100644 --- a/wgpu/src/shader/quad.vert.spv +++ b/wgpu/src/shader/quad.vert.spv |