From a395e78596d0711a50108cb6654121541337ceb5 Mon Sep 17 00:00:00 2001
From: Bingus <shankern@protonmail.com>
Date: Wed, 24 May 2023 13:08:59 -0700
Subject: Made gradient pack public for iced_graphics::gradient mod for use
 with GradientVertex2D.

---
 wgpu/src/geometry.rs | 43 ++-----------------------------------------
 1 file changed, 2 insertions(+), 41 deletions(-)

(limited to 'wgpu/src/geometry.rs')

diff --git a/wgpu/src/geometry.rs b/wgpu/src/geometry.rs
index d1d4fd3c..13ce2359 100644
--- a/wgpu/src/geometry.rs
+++ b/wgpu/src/geometry.rs
@@ -74,7 +74,7 @@ impl BufferStack {
                 Box::new(tessellation::BuffersBuilder::new(
                     buffer,
                     GradientVertex2DBuilder {
-                        gradient: pack_gradient(gradient),
+                        gradient: gradient.pack(),
                     },
                 ))
             }
@@ -97,7 +97,7 @@ impl BufferStack {
                 Box::new(tessellation::BuffersBuilder::new(
                     buffer,
                     GradientVertex2DBuilder {
-                        gradient: pack_gradient(gradient),
+                        gradient: gradient.pack(),
                     },
                 ))
             }
@@ -623,42 +623,3 @@ pub(super) fn dashed(path: &Path, line_dash: LineDash<'_>) -> Path {
         );
     })
 }
-
-/// Packs the [`Gradient`] for use in shader code.
-fn pack_gradient(gradient: &Gradient) -> [f32; 44] {
-    match gradient {
-        Gradient::Linear(linear) => {
-            let mut pack: [f32; 44] = [0.0; 44];
-            let mut offsets: [f32; 8] = [2.0; 8];
-
-            for (index, stop) in linear.stops.iter().enumerate() {
-                let [r, g, b, a] = stop
-                    .map_or(crate::core::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;
-
-                offsets[index] = stop.map_or(2.0, |s| s.offset);
-            }
-
-            pack[32] = offsets[0];
-            pack[33] = offsets[1];
-            pack[34] = offsets[2];
-            pack[35] = offsets[3];
-            pack[36] = offsets[4];
-            pack[37] = offsets[5];
-            pack[38] = offsets[6];
-            pack[39] = offsets[7];
-
-            pack[40] = linear.start.x;
-            pack[41] = linear.start.y;
-            pack[42] = linear.end.x;
-            pack[43] = linear.end.y;
-
-            pack
-        }
-    }
-}
-- 
cgit 


From 413526ad09d006853eb9659efabee168f4a0e0a4 Mon Sep 17 00:00:00 2001
From: Bingus <shankern@protonmail.com>
Date: Thu, 25 May 2023 10:49:26 -0700
Subject: Created "Packed" data structure for gradient data.

---
 wgpu/src/geometry.rs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'wgpu/src/geometry.rs')

diff --git a/wgpu/src/geometry.rs b/wgpu/src/geometry.rs
index 13ce2359..f3fed7ae 100644
--- a/wgpu/src/geometry.rs
+++ b/wgpu/src/geometry.rs
@@ -7,6 +7,7 @@ use crate::graphics::geometry::{
 use crate::graphics::primitive::{self, Primitive};
 use crate::graphics::Gradient;
 
+use iced_graphics::gradient;
 use lyon::geom::euclid;
 use lyon::tessellation;
 use std::borrow::Cow;
@@ -490,7 +491,7 @@ impl Frame {
 }
 
 struct GradientVertex2DBuilder {
-    gradient: [f32; 44],
+    gradient: gradient::Packed,
 }
 
 impl tessellation::FillVertexConstructor<primitive::GradientVertex2D>
@@ -504,7 +505,7 @@ impl tessellation::FillVertexConstructor<primitive::GradientVertex2D>
 
         primitive::GradientVertex2D {
             position: [position.x, position.y],
-            gradient: self.gradient,
+            gradient: self.gradient.data,
         }
     }
 }
@@ -520,7 +521,7 @@ impl tessellation::StrokeVertexConstructor<primitive::GradientVertex2D>
 
         primitive::GradientVertex2D {
             position: [position.x, position.y],
-            gradient: self.gradient,
+            gradient: self.gradient.data,
         }
     }
 }
-- 
cgit 


From 902e333148a1ceed85aba36262a849aaed8d3ac9 Mon Sep 17 00:00:00 2001
From: Bingus <shankern@protonmail.com>
Date: Fri, 26 May 2023 10:07:52 -0700
Subject: Changed gradient::Packed to be `repr(C)` for direct gpu upload.

---
 wgpu/src/geometry.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'wgpu/src/geometry.rs')

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,
         }
     }
 }
-- 
cgit