diff options
author | 2022-04-26 19:18:18 -0300 | |
---|---|---|
committer | 2022-04-27 15:25:16 -0300 | |
commit | 984d1f375ecec301dd42b049eecd1b88e3bca32a (patch) | |
tree | f918985683a1568f9c1a96b53580c384c3a7d5aa /wgpu/src/window/compositor.rs | |
parent | 5be1ac18fe1757d31386f98774d823bd1137eea4 (diff) | |
download | iced-984d1f375ecec301dd42b049eecd1b88e3bca32a.tar.gz iced-984d1f375ecec301dd42b049eecd1b88e3bca32a.tar.bz2 iced-984d1f375ecec301dd42b049eecd1b88e3bca32a.zip |
Move `compositor` module access from `window` to `crate`
Diffstat (limited to 'wgpu/src/window/compositor.rs')
-rw-r--r-- | wgpu/src/window/compositor.rs | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/wgpu/src/window/compositor.rs b/wgpu/src/window/compositor.rs index 01e52162..04393fe5 100644 --- a/wgpu/src/window/compositor.rs +++ b/wgpu/src/window/compositor.rs @@ -1,6 +1,7 @@ use crate::{Backend, Color, Error, Renderer, Settings, Viewport}; use futures::task::SpawnExt; +use iced_graphics::compositor; use iced_native::futures; use raw_window_handle::HasRawWindowHandle; @@ -157,10 +158,10 @@ impl iced_graphics::window::Compositor for Compositor { ); } - fn get_information(&self) -> iced_graphics::window::Information { + fn get_information(&self) -> compositor::Information { let information = self.adapter.get_info(); - iced_graphics::window::Information { + compositor::Information { adapter: information.name, backend: format!("{:?}", information.backend), } @@ -173,7 +174,7 @@ impl iced_graphics::window::Compositor for Compositor { viewport: &Viewport, background_color: Color, overlay: &[T], - ) -> Result<(), iced_graphics::window::SurfaceError> { + ) -> Result<(), compositor::SurfaceError> { match surface.get_current_texture() { Ok(frame) => { let mut encoder = self.device.create_command_encoder( @@ -241,16 +242,14 @@ impl iced_graphics::window::Compositor for Compositor { } Err(error) => match error { wgpu::SurfaceError::Timeout => { - Err(iced_graphics::window::SurfaceError::Timeout) + Err(compositor::SurfaceError::Timeout) } wgpu::SurfaceError::Outdated => { - Err(iced_graphics::window::SurfaceError::Outdated) - } - wgpu::SurfaceError::Lost => { - Err(iced_graphics::window::SurfaceError::Lost) + Err(compositor::SurfaceError::Outdated) } + wgpu::SurfaceError::Lost => Err(compositor::SurfaceError::Lost), wgpu::SurfaceError::OutOfMemory => { - Err(iced_graphics::window::SurfaceError::OutOfMemory) + Err(compositor::SurfaceError::OutOfMemory) } }, } |