diff options
| author |  Héctor Ramón Jiménez <hector0193@gmail.com> | 2023-04-08 06:14:25 +0200 |
|---|---|---|
| committer | Héctor Ramón Jiménez <hector0193@gmail.com> | 2023-04-08 06:14:25 +0200 |
| commit | 1872f7fa6d7b9ca9fa0db8d14bf44dcd3513ffca (patch) | |
| tree | 3f9cdeb52957100bcc07ad64cd40d3a6c060ff15 /wgpu | |
| parent | 16e6efe020e75d51958875fa198196534679af8d (diff) | |
| download | iced-1872f7fa6d7b9ca9fa0db8d14bf44dcd3513ffca.tar.gz iced-1872f7fa6d7b9ca9fa0db8d14bf44dcd3513ffca.tar.bz2 iced-1872f7fa6d7b9ca9fa0db8d14bf44dcd3513ffca.zip | |
Use `*_from_env` helpers from `wgpu` in `iced_wgpu`
Diffstat (limited to 'wgpu')
| -rw-r--r-- | wgpu/src/settings.rs | 17 | ||||
| -rw-r--r-- | wgpu/src/window/compositor.rs | 11 |
2 files changed, 7 insertions, 21 deletions
diff --git a/wgpu/src/settings.rs b/wgpu/src/settings.rs index ff041bdf..266a2c87 100644 --- a/wgpu/src/settings.rs +++ b/wgpu/src/settings.rs @@ -46,7 +46,7 @@ impl Settings { /// - `primary` pub fn from_env() -> Self { Settings { - internal_backend: backend_from_env() + internal_backend: wgpu::util::backend_bits_from_env() .unwrap_or(wgpu::Backends::all()), ..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}"), - } - }) -} diff --git a/wgpu/src/window/compositor.rs b/wgpu/src/window/compositor.rs index 025cd43a..15bef60c 100644 --- a/wgpu/src/window/compositor.rs +++ b/wgpu/src/window/compositor.rs @@ -53,11 +53,12 @@ impl<Theme> Compositor<Theme> { let adapter = instance .request_adapter(&wgpu::RequestAdapterOptions { - power_preference: if settings.antialiasing.is_none() { - wgpu::PowerPreference::LowPower - } else { - wgpu::PowerPreference::HighPerformance - }, + power_preference: wgpu::util::power_preference_from_env() + .unwrap_or(if settings.antialiasing.is_none() { + wgpu::PowerPreference::LowPower + } else { + wgpu::PowerPreference::HighPerformance + }), compatible_surface: compatible_surface.as_ref(), force_fallback_adapter: false, }) |