From 18753b77fc7a64292748fb303fa75fde1dd65f4d Mon Sep 17 00:00:00 2001 From: Poly Date: Thu, 19 Aug 2021 03:06:35 +0200 Subject: wgpu: Update to 0.10 --- graphics/src/window/compositor.rs | 1 + 1 file changed, 1 insertion(+) (limited to 'graphics') diff --git a/graphics/src/window/compositor.rs b/graphics/src/window/compositor.rs index de2a6990..20df8c8b 100644 --- a/graphics/src/window/compositor.rs +++ b/graphics/src/window/compositor.rs @@ -51,6 +51,7 @@ pub trait Compositor: Sized { &mut self, renderer: &mut Self::Renderer, swap_chain: &mut Self::SwapChain, + surface: &mut Self::Surface, viewport: &Viewport, background_color: Color, output: &::Output, -- cgit From fe0de182c57e3a434026b1937b9a02597263afc3 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Fri, 20 Aug 2021 20:32:04 +0700 Subject: Remove `SwapChain` associated type from `Compositor` --- graphics/src/window/compositor.rs | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'graphics') diff --git a/graphics/src/window/compositor.rs b/graphics/src/window/compositor.rs index 20df8c8b..0cf11f31 100644 --- a/graphics/src/window/compositor.rs +++ b/graphics/src/window/compositor.rs @@ -16,9 +16,6 @@ pub trait Compositor: Sized { /// The surface of the backend. type Surface; - /// The swap chain of the backend. - type SwapChain; - /// Creates a new [`Compositor`]. fn new( settings: Self::Settings, @@ -37,12 +34,12 @@ pub trait Compositor: Sized { /// /// [`SwapChain`]: Self::SwapChain /// [`Surface`]: Self::Surface - fn create_swap_chain( + fn configure_surface( &mut self, - surface: &Self::Surface, + surface: &mut Self::Surface, width: u32, height: u32, - ) -> Self::SwapChain; + ); /// Draws the output primitives to the next frame of the given [`SwapChain`]. /// @@ -50,7 +47,6 @@ pub trait Compositor: Sized { fn draw>( &mut self, renderer: &mut Self::Renderer, - swap_chain: &mut Self::SwapChain, surface: &mut Self::Surface, viewport: &Viewport, background_color: Color, -- cgit From acc47a595300ff9bb9cae1e26c2d41135cde8ae8 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Wed, 25 Aug 2021 15:42:35 +0700 Subject: Rename `SwapChainError` to `SurfaceError` in `iced_graphics` --- graphics/src/window.rs | 2 +- graphics/src/window/compositor.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'graphics') diff --git a/graphics/src/window.rs b/graphics/src/window.rs index 365ddfbc..67ec3322 100644 --- a/graphics/src/window.rs +++ b/graphics/src/window.rs @@ -4,7 +4,7 @@ mod compositor; #[cfg(feature = "opengl")] mod gl_compositor; -pub use compositor::{Compositor, SwapChainError}; +pub use compositor::{Compositor, SurfaceError}; #[cfg(feature = "opengl")] pub use gl_compositor::GLCompositor; diff --git a/graphics/src/window/compositor.rs b/graphics/src/window/compositor.rs index 0cf11f31..37edef1d 100644 --- a/graphics/src/window/compositor.rs +++ b/graphics/src/window/compositor.rs @@ -52,12 +52,12 @@ pub trait Compositor: Sized { background_color: Color, output: &::Output, overlay: &[T], - ) -> Result; + ) -> Result; } /// Result of an unsuccessful call to [`Compositor::draw`]. #[derive(Clone, PartialEq, Eq, Debug, Error)] -pub enum SwapChainError { +pub enum SurfaceError { /// A timeout was encountered while trying to acquire the next frame. #[error( "A timeout was encountered while trying to acquire the next frame" -- cgit