From a1a5fcfd46622d5b18d1716aa2adb4659835ccf3 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Wed, 20 May 2020 20:28:35 +0200
Subject: Refactor `Viewport` and `Compositor`

---
 graphics/src/window/compositor.rs | 60 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)
 create mode 100644 graphics/src/window/compositor.rs

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

diff --git a/graphics/src/window/compositor.rs b/graphics/src/window/compositor.rs
new file mode 100644
index 00000000..82faa6e1
--- /dev/null
+++ b/graphics/src/window/compositor.rs
@@ -0,0 +1,60 @@
+use crate::Viewport;
+use iced_native::mouse;
+use raw_window_handle::HasRawWindowHandle;
+
+/// A graphics compositor that can draw to windows.
+pub trait Compositor: Sized {
+    /// The settings of the backend.
+    type Settings: Default + Clone;
+
+    /// The iced renderer of the backend.
+    type Renderer: iced_native::Renderer;
+
+    /// The surface of the backend.
+    type Surface;
+
+    /// The swap chain of the backend.
+    type SwapChain;
+
+    /// Creates a new [`Backend`].
+    ///
+    /// [`Backend`]: trait.Backend.html
+    fn new(settings: Self::Settings) -> Self;
+
+    /// Crates a new [`Surface`] for the given window.
+    ///
+    /// [`Surface`]: #associatedtype.Surface
+    fn create_surface<W: HasRawWindowHandle>(
+        &mut self,
+        window: &W,
+    ) -> Self::Surface;
+
+    /// Crates a new [`Renderer`].
+    ///
+    /// [`Renderer`]: #associatedtype.Renderer
+    fn create_renderer(&mut self, settings: Self::Settings) -> Self::Renderer;
+
+    /// Crates a new [`SwapChain`] for the given [`Surface`].
+    ///
+    /// [`SwapChain`]: #associatedtype.SwapChain
+    /// [`Surface`]: #associatedtype.Surface
+    fn create_swap_chain(
+        &mut self,
+        surface: &Self::Surface,
+        width: u32,
+        height: u32,
+    ) -> Self::SwapChain;
+
+    /// Draws the output primitives to the next frame of the given [`SwapChain`].
+    ///
+    /// [`SwapChain`]: #associatedtype.SwapChain
+    /// [`Surface`]: #associatedtype.Surface
+    fn draw<T: AsRef<str>>(
+        &mut self,
+        renderer: &mut Self::Renderer,
+        swap_chain: &mut Self::SwapChain,
+        viewport: &Viewport,
+        output: &<Self::Renderer as iced_native::Renderer>::Output,
+        overlay: &[T],
+    ) -> mouse::Interaction;
+}
-- 
cgit 


From ae5e2c6c734894d71b2034a498a858b7997c5d3d Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Thu, 21 May 2020 04:27:31 +0200
Subject: Introduce `Program` and `State`

---
 graphics/src/window/compositor.rs | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

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

diff --git a/graphics/src/window/compositor.rs b/graphics/src/window/compositor.rs
index 82faa6e1..d5920c95 100644
--- a/graphics/src/window/compositor.rs
+++ b/graphics/src/window/compositor.rs
@@ -5,7 +5,7 @@ use raw_window_handle::HasRawWindowHandle;
 /// A graphics compositor that can draw to windows.
 pub trait Compositor: Sized {
     /// The settings of the backend.
-    type Settings: Default + Clone;
+    type Settings: Default;
 
     /// The iced renderer of the backend.
     type Renderer: iced_native::Renderer;
@@ -19,7 +19,7 @@ pub trait Compositor: Sized {
     /// Creates a new [`Backend`].
     ///
     /// [`Backend`]: trait.Backend.html
-    fn new(settings: Self::Settings) -> Self;
+    fn new(settings: Self::Settings) -> (Self, Self::Renderer);
 
     /// Crates a new [`Surface`] for the given window.
     ///
@@ -29,11 +29,6 @@ pub trait Compositor: Sized {
         window: &W,
     ) -> Self::Surface;
 
-    /// Crates a new [`Renderer`].
-    ///
-    /// [`Renderer`]: #associatedtype.Renderer
-    fn create_renderer(&mut self, settings: Self::Settings) -> Self::Renderer;
-
     /// Crates a new [`SwapChain`] for the given [`Surface`].
     ///
     /// [`SwapChain`]: #associatedtype.SwapChain
-- 
cgit