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/quad.rs | |
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 'wgpu/src/quad.rs')
-rw-r--r-- | wgpu/src/quad.rs | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/wgpu/src/quad.rs b/wgpu/src/quad.rs index c292dec3..fe3276a3 100644 --- a/wgpu/src/quad.rs +++ b/wgpu/src/quad.rs @@ -125,9 +125,19 @@ impl Pipeline { }, wgpu::VertexAttributeDescriptor { shader_location: 4, - format: wgpu::VertexFormat::Float, + format: wgpu::VertexFormat::Float4, offset: 4 * (2 + 2 + 4), }, + wgpu::VertexAttributeDescriptor { + shader_location: 5, + format: wgpu::VertexFormat::Float, + offset: 4 * (2 + 2 + 4 + 4), + }, + wgpu::VertexAttributeDescriptor { + shader_location: 6, + format: wgpu::VertexFormat::Float, + offset: 4 * (2 + 2 + 4 + 4 + 1), + }, ], }, ], @@ -233,7 +243,8 @@ impl Pipeline { bounds.x, bounds.y, bounds.width, - bounds.height, + // TODO: Address anti-aliasing adjustments properly + bounds.height + 1, ); render_pass.draw_indexed( @@ -277,7 +288,9 @@ pub struct Quad { pub position: [f32; 2], pub scale: [f32; 2], pub color: [f32; 4], + pub border_color: [f32; 4], pub border_radius: f32, + pub border_width: f32, } impl Quad { |