diff options
Diffstat (limited to '')
| -rw-r--r-- | graphics/src/gradient.rs | 14 | ||||
| -rw-r--r-- | graphics/src/primitive.rs | 3 | ||||
| -rw-r--r-- | wgpu/src/geometry.rs | 4 | ||||
| -rw-r--r-- | wgpu/src/layer.rs | 28 | ||||
| -rw-r--r-- | wgpu/src/layer/quad.rs | 4 |
5 files changed, 31 insertions, 22 deletions
diff --git a/graphics/src/gradient.rs b/graphics/src/gradient.rs index 2b6aba44..9f1e7bbc 100644 --- a/graphics/src/gradient.rs +++ b/graphics/src/gradient.rs @@ -116,13 +116,17 @@ impl Linear { data[42] = self.end.x; data[43] = self.end.y; - Packed { data } + Packed(data) } } /// Packed [`Gradient`] data for use in shader code. -#[derive(Debug)] -pub struct Packed { - /// The packed [`Gradient`] data. - pub data: [f32; 44], +#[derive(Debug, Copy, Clone, PartialEq)] +#[repr(C)] +pub struct Packed([f32; 44]); + +impl From<[f32; 44]> for Packed { + fn from(value: [f32; 44]) -> Self { + Self(value) + } } diff --git a/graphics/src/primitive.rs b/graphics/src/primitive.rs index 9728db39..2d4f5511 100644 --- a/graphics/src/primitive.rs +++ b/graphics/src/primitive.rs @@ -4,6 +4,7 @@ use crate::core::image; use crate::core::svg; use crate::core::text; use crate::core::{Background, Color, Font, Rectangle, Size, Vector}; +use crate::gradient; use bytemuck::{Pod, Zeroable}; use std::sync::Arc; @@ -258,7 +259,7 @@ pub struct GradientVertex2D { pub position: [f32; 2], /// The packed vertex data of the gradient. - pub gradient: [f32; 44], + pub gradient: gradient::Packed, } #[allow(unsafe_code)] diff --git a/wgpu/src/geometry.rs b/wgpu/src/geometry.rs index f3fed7ae..740ec20c 100644 --- a/wgpu/src/geometry.rs +++ b/wgpu/src/geometry.rs @@ -505,7 +505,7 @@ impl tessellation::FillVertexConstructor<primitive::GradientVertex2D> primitive::GradientVertex2D { position: [position.x, position.y], - gradient: self.gradient.data, + gradient: self.gradient, } } } @@ -521,7 +521,7 @@ impl tessellation::StrokeVertexConstructor<primitive::GradientVertex2D> primitive::GradientVertex2D { position: [position.x, position.y], - gradient: self.gradient.data, + gradient: self.gradient, } } } diff --git a/wgpu/src/layer.rs b/wgpu/src/layer.rs index 980d807b..9d7f9f2a 100644 --- a/wgpu/src/layer.rs +++ b/wgpu/src/layer.rs @@ -13,6 +13,7 @@ pub use text::Text; use crate::core; use crate::core::alignment; use crate::core::{Background, Color, Font, Point, Rectangle, Size, Vector}; +use crate::graphics::gradient; use crate::graphics::{Primitive, Viewport}; /// A group of primitives that should be clipped together. @@ -312,30 +313,33 @@ impl<'a> Layer<'a> { } /// Packs the [`Gradient`] for use in shader code. -fn pack_gradient(gradient: &core::Gradient, bounds: Rectangle) -> [f32; 44] { +fn pack_gradient( + gradient: &core::Gradient, + bounds: Rectangle, +) -> gradient::Packed { match gradient { core::Gradient::Linear(linear) => { - let mut pack: [f32; 44] = [0.0; 44]; + let mut data: [f32; 44] = [0.0; 44]; for (index, stop) in linear.stops.iter().enumerate() { let [r, g, b, a] = stop.map_or(Color::default(), |s| s.color).into_linear(); - pack[index * 4] = r; - pack[(index * 4) + 1] = g; - pack[(index * 4) + 2] = b; - pack[(index * 4) + 3] = a; - pack[32 + index] = stop.map_or(2.0, |s| s.offset); + data[index * 4] = r; + data[(index * 4) + 1] = g; + data[(index * 4) + 2] = b; + data[(index * 4) + 3] = a; + data[32 + index] = stop.map_or(2.0, |s| s.offset); } let (start, end) = linear.angle.to_distance(&bounds); - pack[40] = start.x; - pack[41] = start.y; - pack[42] = end.x; - pack[43] = end.y; + data[40] = start.x; + data[41] = start.y; + data[42] = end.x; + data[43] = end.y; - pack + data.into() } } } diff --git a/wgpu/src/layer/quad.rs b/wgpu/src/layer/quad.rs index 9913cfe0..0bf7837a 100644 --- a/wgpu/src/layer/quad.rs +++ b/wgpu/src/layer/quad.rs @@ -1,5 +1,5 @@ //! A rectangle with certain styled properties. - +use crate::graphics::gradient; use bytemuck::{Pod, Zeroable}; /// The properties of a quad. @@ -38,7 +38,7 @@ pub struct Solid { #[repr(C)] pub struct Gradient { /// The background gradient data of the quad. - pub gradient: [f32; 44], + pub gradient: gradient::Packed, /// The [`Quad`] data of the [`Gradient`]. pub quad: Quad, |