From 03b34931383e701c39c653a7662a616fe21a0947 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Thu, 14 Oct 2021 16:07:22 +0700
Subject: Remove trait-specific draw logic in `iced_native`

---
 wgpu/src/window/compositor.rs | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

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

diff --git a/wgpu/src/window/compositor.rs b/wgpu/src/window/compositor.rs
index eca54b6f..f29a50f5 100644
--- a/wgpu/src/window/compositor.rs
+++ b/wgpu/src/window/compositor.rs
@@ -1,7 +1,7 @@
 use crate::{Backend, Color, Error, Renderer, Settings, Viewport};
 
 use futures::task::SpawnExt;
-use iced_native::{futures, mouse};
+use iced_native::futures;
 use raw_window_handle::HasRawWindowHandle;
 
 /// A window graphics backend for iced powered by `wgpu`.
@@ -132,15 +132,14 @@ impl iced_graphics::window::Compositor for Compositor {
         );
     }
 
-    fn draw<T: AsRef<str>>(
+    fn present<T: AsRef<str>>(
         &mut self,
         renderer: &mut Self::Renderer,
         surface: &mut Self::Surface,
         viewport: &Viewport,
         background_color: Color,
-        output: &<Self::Renderer as iced_native::Renderer>::Output,
         overlay: &[T],
-    ) -> Result<mouse::Interaction, iced_graphics::window::SurfaceError> {
+    ) -> Result<(), iced_graphics::window::SurfaceError> {
         match surface.get_current_frame() {
             Ok(frame) => {
                 let mut encoder = self.device.create_command_encoder(
@@ -180,15 +179,17 @@ impl iced_graphics::window::Compositor for Compositor {
                         depth_stencil_attachment: None,
                     });
 
-                let mouse_interaction = renderer.backend_mut().draw(
-                    &mut self.device,
-                    &mut self.staging_belt,
-                    &mut encoder,
-                    view,
-                    viewport,
-                    output,
-                    overlay,
-                );
+                renderer.present(|backend, primitive| {
+                    backend.present(
+                        &mut self.device,
+                        &mut self.staging_belt,
+                        &mut encoder,
+                        view,
+                        primitive,
+                        viewport,
+                        overlay,
+                    );
+                });
 
                 // Submit work
                 self.staging_belt.finish();
@@ -202,7 +203,7 @@ impl iced_graphics::window::Compositor for Compositor {
 
                 self.local_pool.run_until_stalled();
 
-                Ok(mouse_interaction)
+                Ok(())
             }
             Err(error) => match error {
                 wgpu::SurfaceError::Timeout => {
-- 
cgit 


From 9fe65ed729c75a8401765cf373345aaba93352ca Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Fri, 5 Nov 2021 15:38:27 +0700
Subject: Rename `Renderer::present` to `with_primitives`

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

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

diff --git a/wgpu/src/window/compositor.rs b/wgpu/src/window/compositor.rs
index 7bdd4c23..3b264475 100644
--- a/wgpu/src/window/compositor.rs
+++ b/wgpu/src/window/compositor.rs
@@ -179,13 +179,13 @@ impl iced_graphics::window::Compositor for Compositor {
                         depth_stencil_attachment: None,
                     });
 
-                renderer.present(|backend, primitive| {
+                renderer.with_primitives(|backend, primitives| {
                     backend.present(
                         &mut self.device,
                         &mut self.staging_belt,
                         &mut encoder,
                         view,
-                        primitive,
+                        primitives,
                         viewport,
                         overlay,
                     );
-- 
cgit