summaryrefslogtreecommitdiffstats
path: root/wgpu/src/layer.rs
diff options
context:
space:
mode:
authorLibravatar Bingus <shankern@protonmail.com>2023-05-26 10:07:52 -0700
committerLibravatar Bingus <shankern@protonmail.com>2023-05-26 10:13:18 -0700
commit902e333148a1ceed85aba36262a849aaed8d3ac9 (patch)
treed1b0db241d1f693798ca4dce4d19728d413454fb /wgpu/src/layer.rs
parent413526ad09d006853eb9659efabee168f4a0e0a4 (diff)
downloadiced-902e333148a1ceed85aba36262a849aaed8d3ac9.tar.gz
iced-902e333148a1ceed85aba36262a849aaed8d3ac9.tar.bz2
iced-902e333148a1ceed85aba36262a849aaed8d3ac9.zip
Changed gradient::Packed to be `repr(C)` for direct gpu upload.
Diffstat (limited to 'wgpu/src/layer.rs')
-rw-r--r--wgpu/src/layer.rs28
1 files changed, 16 insertions, 12 deletions
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()
}
}
}