diff options
Diffstat (limited to '')
| -rw-r--r-- | graphics/src/gradient.rs | 14 | ||||
| -rw-r--r-- | graphics/src/primitive.rs | 3 |
2 files changed, 11 insertions, 6 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)] |