From ef547469fdc8fe4faaa9902d9a8c920684f07189 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Tue, 30 May 2023 01:33:50 +0200
Subject: Improve boundaries between `quad` submodules in `iced_wgpu`

---
 wgpu/src/quad.rs | 27 ++++++++++-----------------
 1 file changed, 10 insertions(+), 17 deletions(-)

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

diff --git a/wgpu/src/quad.rs b/wgpu/src/quad.rs
index deb6d59a..9c5ed05f 100644
--- a/wgpu/src/quad.rs
+++ b/wgpu/src/quad.rs
@@ -116,21 +116,23 @@ impl Pipeline {
             for (kind, count) in &quads.order {
                 match kind {
                     Kind::Solid => {
-                        render_pass.set_pipeline(&self.solid.pipeline);
-                        layer.solid.draw(
-                            &layer.constants,
+                        self.solid.render(
                             render_pass,
+                            &layer.constants,
+                            &layer.solid,
                             solid_offset..(solid_offset + count),
                         );
+
                         solid_offset += count;
                     }
                     Kind::Gradient => {
-                        render_pass.set_pipeline(&self.gradient.pipeline);
-                        layer.gradient.draw(
-                            &layer.constants,
+                        self.gradient.render(
                             render_pass,
+                            &layer.constants,
+                            &layer.gradient,
                             gradient_offset..(gradient_offset + count),
                         );
+
                         gradient_offset += count;
                     }
                 }
@@ -199,17 +201,8 @@ impl Layer {
             bytemuck::bytes_of(&uniforms),
         );
 
-        let _ = self.solid.instances.resize(device, quads.solids.len());
-        let _ = self
-            .gradient
-            .instances
-            .resize(device, quads.gradients.len());
-
-        let _ = self.solid.instances.write(queue, 0, &quads.solids);
-        let _ = self.gradient.instances.write(queue, 0, &quads.gradients);
-
-        self.solid.instance_count = quads.solids.len();
-        self.gradient.instance_count = quads.gradients.len();
+        self.solid.prepare(device, queue, &quads.solids);
+        self.gradient.prepare(device, queue, &quads.gradients);
     }
 }
 
-- 
cgit