me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove inconsistent wgpu imports

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2022-11-01 19:17:08 +01:00
parent 0a12590b6f
commit bea5882c58
No known key found for this signature in database
GPG key ID: 140CC052C94F138E
2 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
examples/integration_wgpu/src/main.rs
View file

@ -16,7 +16,6 @@ use winit::{
event_loop::{ControlFlow, EventLoop}, event_loop::{ControlFlow, EventLoop},
}; };
use crate::wgpu::CompositeAlphaMode;
#[cfg(target_arch = "wasm32")] #[cfg(target_arch = "wasm32")]
use wasm_bindgen::JsCast; use wasm_bindgen::JsCast;
#[cfg(target_arch = "wasm32")] #[cfg(target_arch = "wasm32")]
@ -120,7 +119,7 @@ pub fn main() {
width: physical_size.width, width: physical_size.width,
height: physical_size.height, height: physical_size.height,
present_mode: wgpu::PresentMode::AutoVsync, present_mode: wgpu::PresentMode::AutoVsync,
alpha_mode: CompositeAlphaMode::Auto, alpha_mode: wgpu::CompositeAlphaMode::Auto,
}, },
); );
@ -215,7 +214,7 @@ pub fn main() {
width: size.width, width: size.width,
height: size.height, height: size.height,
present_mode: wgpu::PresentMode::AutoVsync, present_mode: wgpu::PresentMode::AutoVsync,
alpha_mode: CompositeAlphaMode::Auto alpha_mode: wgpu::CompositeAlphaMode::Auto
}, },
); );

3
wgpu/src/window/compositor.rs
View file

@ -7,7 +7,6 @@ use iced_native::futures;
use raw_window_handle::{HasRawDisplayHandle, HasRawWindowHandle}; use raw_window_handle::{HasRawDisplayHandle, HasRawWindowHandle};
use std::marker::PhantomData; use std::marker::PhantomData;
use wgpu::CompositeAlphaMode;
/// A window graphics backend for iced powered by `wgpu`. /// A window graphics backend for iced powered by `wgpu`.
#[allow(missing_debug_implementations)] #[allow(missing_debug_implementations)]
@ -163,7 +162,7 @@ impl<Theme> iced_graphics::window::Compositor for Compositor<Theme> {
present_mode: self.settings.present_mode, present_mode: self.settings.present_mode,
width, width,
height, height,
alpha_mode: CompositeAlphaMode::Auto, alpha_mode: wgpu::CompositeAlphaMode::Auto,
}, },
); );
} }