From baf51a8fcffc78e4ca20f7dcbba18ca3655f2840 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Tue, 31 Jan 2023 06:29:21 +0100
Subject: Draft `glyphon` implementation of text pipeline for `iced_wgpu`

---
 wgpu/src/window/compositor.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'wgpu/src/window/compositor.rs')

diff --git a/wgpu/src/window/compositor.rs b/wgpu/src/window/compositor.rs
index 6d0c36f6..50231f7c 100644
--- a/wgpu/src/window/compositor.rs
+++ b/wgpu/src/window/compositor.rs
@@ -114,7 +114,7 @@ impl<Theme> Compositor<Theme> {
 
     /// Creates a new rendering [`Backend`] for this [`Compositor`].
     pub fn create_backend(&self) -> Backend {
-        Backend::new(&self.device, self.settings, self.format)
+        Backend::new(&self.device, &self.queue, self.settings, self.format)
     }
 }
 
@@ -227,6 +227,7 @@ impl<Theme> iced_graphics::window::Compositor for Compositor<Theme> {
                 renderer.with_primitives(|backend, primitives| {
                     backend.present(
                         &self.device,
+                        &self.queue,
                         &mut self.staging_belt,
                         &mut encoder,
                         view,
-- 
cgit 


From b8c1809ea101cece6943432fd3597f785c39af09 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Tue, 7 Feb 2023 23:55:16 +0100
Subject: Refactor `triangle::Pipeline` into `prepare` and `render`
 architecture

And get rid of the staging belt! :tada:
---
 wgpu/src/window/compositor.rs | 11 -----------
 1 file changed, 11 deletions(-)

(limited to 'wgpu/src/window/compositor.rs')

diff --git a/wgpu/src/window/compositor.rs b/wgpu/src/window/compositor.rs
index 50231f7c..6e1acc06 100644
--- a/wgpu/src/window/compositor.rs
+++ b/wgpu/src/window/compositor.rs
@@ -16,14 +16,11 @@ pub struct Compositor<Theme> {
     adapter: wgpu::Adapter,
     device: wgpu::Device,
     queue: wgpu::Queue,
-    staging_belt: wgpu::util::StagingBelt,
     format: wgpu::TextureFormat,
     theme: PhantomData<Theme>,
 }
 
 impl<Theme> Compositor<Theme> {
-    const CHUNK_SIZE: u64 = 10 * 1024;
-
     /// Requests a new [`Compositor`] with the given [`Settings`].
     ///
     /// Returns `None` if no compatible graphics adapter could be found.
@@ -98,15 +95,12 @@ impl<Theme> Compositor<Theme> {
             .next()
             .await?;
 
-        let staging_belt = wgpu::util::StagingBelt::new(Self::CHUNK_SIZE);
-
         Some(Compositor {
             instance,
             settings,
             adapter,
             device,
             queue,
-            staging_belt,
             format,
             theme: PhantomData,
         })
@@ -228,7 +222,6 @@ impl<Theme> iced_graphics::window::Compositor for Compositor<Theme> {
                     backend.present(
                         &self.device,
                         &self.queue,
-                        &mut self.staging_belt,
                         &mut encoder,
                         view,
                         primitives,
@@ -238,13 +231,9 @@ impl<Theme> iced_graphics::window::Compositor for Compositor<Theme> {
                 });
 
                 // Submit work
-                self.staging_belt.finish();
                 let _submission = self.queue.submit(Some(encoder.finish()));
                 frame.present();
 
-                // Recall staging buffers
-                self.staging_belt.recall();
-
                 Ok(())
             }
             Err(error) => match error {
-- 
cgit 


From 730d6a07564d014c470e02f233394ec98325d463 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Wed, 8 Feb 2023 00:47:16 +0100
Subject: Reuse a `RenderPass` as much as possible in `iced_wgpu`

---
 wgpu/src/window/compositor.rs | 29 +----------------------------
 1 file changed, 1 insertion(+), 28 deletions(-)

(limited to 'wgpu/src/window/compositor.rs')

diff --git a/wgpu/src/window/compositor.rs b/wgpu/src/window/compositor.rs
index 6e1acc06..365cb603 100644
--- a/wgpu/src/window/compositor.rs
+++ b/wgpu/src/window/compositor.rs
@@ -190,39 +190,12 @@ impl<Theme> iced_graphics::window::Compositor for Compositor<Theme> {
                     .texture
                     .create_view(&wgpu::TextureViewDescriptor::default());
 
-                let _ =
-                    encoder.begin_render_pass(&wgpu::RenderPassDescriptor {
-                        label: Some(
-                            "iced_wgpu::window::Compositor render pass",
-                        ),
-                        color_attachments: &[Some(
-                            wgpu::RenderPassColorAttachment {
-                                view,
-                                resolve_target: None,
-                                ops: wgpu::Operations {
-                                    load: wgpu::LoadOp::Clear({
-                                        let [r, g, b, a] =
-                                            background_color.into_linear();
-
-                                        wgpu::Color {
-                                            r: f64::from(r),
-                                            g: f64::from(g),
-                                            b: f64::from(b),
-                                            a: f64::from(a),
-                                        }
-                                    }),
-                                    store: true,
-                                },
-                            },
-                        )],
-                        depth_stencil_attachment: None,
-                    });
-
                 renderer.with_primitives(|backend, primitives| {
                     backend.present(
                         &self.device,
                         &self.queue,
                         &mut encoder,
+                        Some(background_color),
                         view,
                         primitives,
                         viewport,
-- 
cgit