diff options
Diffstat (limited to '')
-rw-r--r-- | wgpu/src/quad.rs | 5 | ||||
-rw-r--r-- | wgpu/src/quad/solid.rs | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/wgpu/src/quad.rs b/wgpu/src/quad.rs index 9c5ed05f..37d0c623 100644 --- a/wgpu/src/quad.rs +++ b/wgpu/src/quad.rs @@ -5,6 +5,7 @@ use gradient::Gradient; use solid::Solid; use crate::core::{Background, Rectangle}; +use crate::graphics::color; use crate::graphics::{self, Transformation}; use bytemuck::{Pod, Zeroable}; @@ -217,7 +218,7 @@ pub struct Quad { pub size: [f32; 2], /// The border color of the [`Quad`], in __linear RGB__. - pub border_color: [f32; 4], + pub border_color: color::Packed, /// The border radii of the [`Quad`]. pub border_radius: [f32; 4], @@ -250,7 +251,7 @@ impl Batch { let kind = match background { Background::Color(color) => { self.solids.push(Solid { - color: color.into_linear(), + color: color::pack(*color), quad, }); diff --git a/wgpu/src/quad/solid.rs b/wgpu/src/quad/solid.rs index f667c42c..f8f1e3a5 100644 --- a/wgpu/src/quad/solid.rs +++ b/wgpu/src/quad/solid.rs @@ -1,3 +1,4 @@ +use crate::graphics::color; use crate::quad::{self, Quad}; use crate::Buffer; @@ -9,7 +10,7 @@ use std::ops::Range; #[repr(C)] pub struct Solid { /// The background color data of the quad. - pub color: [f32; 4], + pub color: color::Packed, /// The [`Quad`] data of the [`Solid`]. pub quad: Quad, |