diff options
author | 2022-11-01 19:53:03 +0100 | |
---|---|---|
committer | 2022-11-01 19:53:03 +0100 | |
commit | 37c5b15f62ef44e52e49032a2972a76aa653436a (patch) | |
tree | 4029b2c7cdd2f1cd2e5df24b20a0c2059b814fa5 /graphics | |
parent | ac6a3cf8eb77df69cbb6538900786faca778cf05 (diff) | |
parent | 8f6af6bbfc7a14e9dc71b20ccb9045597bbccbad (diff) | |
download | iced-37c5b15f62ef44e52e49032a2972a76aa653436a.tar.gz iced-37c5b15f62ef44e52e49032a2972a76aa653436a.tar.bz2 iced-37c5b15f62ef44e52e49032a2972a76aa653436a.zip |
Merge pull request #1462 from wyatt-herkamp/master
Update `wgpu` to `0.14` and `wgpu_glyph` to `0.18`
Diffstat (limited to 'graphics')
-rw-r--r-- | graphics/Cargo.toml | 2 | ||||
-rw-r--r-- | graphics/src/window/compositor.rs | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/graphics/Cargo.toml b/graphics/Cargo.toml index 49d4d9c6..18fef54f 100644 --- a/graphics/Cargo.toml +++ b/graphics/Cargo.toml @@ -20,7 +20,7 @@ opengl = [] [dependencies] glam = "0.10" -raw-window-handle = "0.4" +raw-window-handle = "0.5" thiserror = "1.0" [dependencies.bytemuck] diff --git a/graphics/src/window/compositor.rs b/graphics/src/window/compositor.rs index 0c4cadcd..52255666 100644 --- a/graphics/src/window/compositor.rs +++ b/graphics/src/window/compositor.rs @@ -2,7 +2,7 @@ //! surfaces. use crate::{Color, Error, Viewport}; -use raw_window_handle::HasRawWindowHandle; +use raw_window_handle::{HasRawDisplayHandle, HasRawWindowHandle}; use thiserror::Error; /// A graphics compositor that can draw to windows. @@ -17,7 +17,7 @@ pub trait Compositor: Sized { type Surface; /// Creates a new [`Compositor`]. - fn new<W: HasRawWindowHandle>( + fn new<W: HasRawWindowHandle + HasRawDisplayHandle>( settings: Self::Settings, compatible_window: Option<&W>, ) -> Result<(Self, Self::Renderer), Error>; @@ -25,7 +25,7 @@ pub trait Compositor: Sized { /// Crates a new [`Surface`] for the given window. /// /// [`Surface`]: Self::Surface - fn create_surface<W: HasRawWindowHandle>( + fn create_surface<W: HasRawWindowHandle + HasRawDisplayHandle>( &mut self, window: &W, ) -> Self::Surface; |