summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Héctor Ramón Jiménez <hector0193@gmail.com>2022-11-01 19:17:08 +0100
committerLibravatar Héctor Ramón Jiménez <hector0193@gmail.com>2022-11-01 19:20:27 +0100
commitbea5882c58edac0bd5300d53b31ee4ac295bda25 (patch)
tree7c8bfd7718d4653f1aadb8e5984ec2149aa4ddca
parent0a12590b6f500394194ccd7588af8c6729426d71 (diff)
downloadiced-bea5882c58edac0bd5300d53b31ee4ac295bda25.tar.gz
iced-bea5882c58edac0bd5300d53b31ee4ac295bda25.tar.bz2
iced-bea5882c58edac0bd5300d53b31ee4ac295bda25.zip
Remove inconsistent `wgpu` imports
-rw-r--r--examples/integration_wgpu/src/main.rs5
-rw-r--r--wgpu/src/window/compositor.rs3
2 files changed, 3 insertions, 5 deletions
diff --git a/examples/integration_wgpu/src/main.rs b/examples/integration_wgpu/src/main.rs
index ed03f77a..70f9a48b 100644
--- a/examples/integration_wgpu/src/main.rs
+++ b/examples/integration_wgpu/src/main.rs
@@ -16,7 +16,6 @@ use winit::{
event_loop::{ControlFlow, EventLoop},
};
-use crate::wgpu::CompositeAlphaMode;
#[cfg(target_arch = "wasm32")]
use wasm_bindgen::JsCast;
#[cfg(target_arch = "wasm32")]
@@ -120,7 +119,7 @@ pub fn main() {
width: physical_size.width,
height: physical_size.height,
present_mode: wgpu::PresentMode::AutoVsync,
- alpha_mode: CompositeAlphaMode::Auto,
+ alpha_mode: wgpu::CompositeAlphaMode::Auto,
},
);
@@ -215,7 +214,7 @@ pub fn main() {
width: size.width,
height: size.height,
present_mode: wgpu::PresentMode::AutoVsync,
- alpha_mode: CompositeAlphaMode::Auto
+ alpha_mode: wgpu::CompositeAlphaMode::Auto
},
);
diff --git a/wgpu/src/window/compositor.rs b/wgpu/src/window/compositor.rs
index c34fa735..6d0c36f6 100644
--- a/wgpu/src/window/compositor.rs
+++ b/wgpu/src/window/compositor.rs
@@ -7,7 +7,6 @@ use iced_native::futures;
use raw_window_handle::{HasRawDisplayHandle, HasRawWindowHandle};
use std::marker::PhantomData;
-use wgpu::CompositeAlphaMode;
/// A window graphics backend for iced powered by `wgpu`.
#[allow(missing_debug_implementations)]
@@ -163,7 +162,7 @@ impl<Theme> iced_graphics::window::Compositor for Compositor<Theme> {
present_mode: self.settings.present_mode,
width,
height,
- alpha_mode: CompositeAlphaMode::Auto,
+ alpha_mode: wgpu::CompositeAlphaMode::Auto,
},
);
}