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

Use *_from_env helpers from wgpu in iced_wgpu

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2023-04-08 06:14:25 +02:00
parent 16e6efe020
commit 1872f7fa6d
No known key found for this signature in database
GPG key ID: 140CC052C94F138E
2 changed files with 7 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

17
wgpu/src/settings.rs
View file

@ -46,7 +46,7 @@ impl Settings {
/// - `primary` /// - `primary`
pub fn from_env() -> Self { pub fn from_env() -> Self {
Settings { Settings {
internal_backend: backend_from_env() internal_backend: wgpu::util::backend_bits_from_env()
.unwrap_or(wgpu::Backends::all()), .unwrap_or(wgpu::Backends::all()),
..Self::default() ..Self::default()
} }
@ -64,18 +64,3 @@ impl Default for Settings {
} }
} }
} }
fn backend_from_env() -> Option<wgpu::Backends> {
std::env::var("WGPU_BACKEND").ok().map(|backend| {
match backend.to_lowercase().as_str() {
"vulkan" => wgpu::Backends::VULKAN,
"metal" => wgpu::Backends::METAL,
"dx12" => wgpu::Backends::DX12,
"dx11" => wgpu::Backends::DX11,
"gl" => wgpu::Backends::GL,
"webgpu" => wgpu::Backends::BROWSER_WEBGPU,
"primary" => wgpu::Backends::PRIMARY,
other => panic!("Unknown backend: {other}"),
}
})
}

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

@ -53,11 +53,12 @@ impl<Theme> Compositor<Theme> {
let adapter = instance let adapter = instance
.request_adapter(&wgpu::RequestAdapterOptions { .request_adapter(&wgpu::RequestAdapterOptions {
power_preference: if settings.antialiasing.is_none() { power_preference: wgpu::util::power_preference_from_env()
wgpu::PowerPreference::LowPower .unwrap_or(if settings.antialiasing.is_none() {
} else { wgpu::PowerPreference::LowPower
wgpu::PowerPreference::HighPerformance } else {
}, wgpu::PowerPreference::HighPerformance
}),
compatible_surface: compatible_surface.as_ref(), compatible_surface: compatible_surface.as_ref(),
force_fallback_adapter: false, force_fallback_adapter: false,
}) })