From a61c96a98579e26383e99e492510b94a22309d43 Mon Sep 17 00:00:00 2001 From: Liam Gallagher Date: Sat, 18 Feb 2023 11:05:39 +1300 Subject: [PATCH 1/4] Change default wgpu backend from `all` to `primary` --- crates/bevy_render/src/settings.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/bevy_render/src/settings.rs b/crates/bevy_render/src/settings.rs index e9f859b0afe7d..423038a263d72 100644 --- a/crates/bevy_render/src/settings.rs +++ b/crates/bevy_render/src/settings.rs @@ -48,7 +48,7 @@ impl Default for WgpuSettings { let default_backends = if cfg!(feature = "webgl") { Backends::GL } else { - Backends::all() + Backends::PRIMARY }; let backends = Some(wgpu::util::backend_bits_from_env().unwrap_or(default_backends)); From a6e58872f3f767aa320bcf8f50f757f97bb5fc83 Mon Sep 17 00:00:00 2001 From: Liam Gallagher Date: Mon, 20 Feb 2023 08:06:40 +1300 Subject: [PATCH 2/4] Use `Backends::PRIMARY` on windows only --- crates/bevy_render/src/settings.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/crates/bevy_render/src/settings.rs b/crates/bevy_render/src/settings.rs index 423038a263d72..065f523a2777a 100644 --- a/crates/bevy_render/src/settings.rs +++ b/crates/bevy_render/src/settings.rs @@ -47,8 +47,10 @@ impl Default for WgpuSettings { fn default() -> Self { let default_backends = if cfg!(feature = "webgl") { Backends::GL - } else { + } else if cfg!(windows) { Backends::PRIMARY + } else { + Backends::all() }; let backends = Some(wgpu::util::backend_bits_from_env().unwrap_or(default_backends)); From 07477b5a605b6f810dbb6831839187d9b0883c24 Mon Sep 17 00:00:00 2001 From: Liam Gallagher Date: Mon, 20 Feb 2023 13:06:54 +1300 Subject: [PATCH 3/4] Add TODO comment linking to issue Co-authored-by: Robert Swain --- crates/bevy_render/src/settings.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/crates/bevy_render/src/settings.rs b/crates/bevy_render/src/settings.rs index 065f523a2777a..ceeaab506ead4 100644 --- a/crates/bevy_render/src/settings.rs +++ b/crates/bevy_render/src/settings.rs @@ -47,6 +47,7 @@ impl Default for WgpuSettings { fn default() -> Self { let default_backends = if cfg!(feature = "webgl") { Backends::GL + // TODO: When https://github.com/gfx-rs/wgpu/issues/2540 is fixed, Windows can also use all() } else if cfg!(windows) { Backends::PRIMARY } else { From ccbf82fdad8ec051cd24e1e0a80a75c862773f5b Mon Sep 17 00:00:00 2001 From: Liam Gallagher Date: Mon, 20 Feb 2023 14:30:44 +1300 Subject: [PATCH 4/4] Use more explicit os check Co-authored-by: James Liu --- crates/bevy_render/src/settings.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/bevy_render/src/settings.rs b/crates/bevy_render/src/settings.rs index ceeaab506ead4..f19f84087132a 100644 --- a/crates/bevy_render/src/settings.rs +++ b/crates/bevy_render/src/settings.rs @@ -48,7 +48,7 @@ impl Default for WgpuSettings { let default_backends = if cfg!(feature = "webgl") { Backends::GL // TODO: When https://github.com/gfx-rs/wgpu/issues/2540 is fixed, Windows can also use all() - } else if cfg!(windows) { + } else if cfg!(target_os = "windows") { Backends::PRIMARY } else { Backends::all()