Add config option for power preference & default to wgpu::PowerPrefer…

…ence::None

comfy-core/src/config.rs

@@ -72,6 +72,13 @@ pub fn game_config_mut() -> AtomicRefMut<'static, GameConfig> {
         .borrow_mut()
 }
 
+#[derive(Copy, Clone, Debug)]
+pub enum PowerPreference {
+    None,
+    LowPower,
+    HighPerformance,
+}
+
 #[derive(Clone, Debug)]
 pub struct GameConfig {
     pub game_name: String,
@@ -80,6 +87,12 @@ pub struct GameConfig {
     pub resolution: ResolutionConfig,
     pub min_resolution: ResolutionConfig,
 
+    /// Overrides `wgpu`'s power preference for adapter selection. Should work around
+    /// a potential issue where when selecting `wgpu::PowerPreference::HighPerformance` is on
+    /// and the user has a laptop with a dual GPU setup where the dedicated GPU is not enabled,
+    /// `wgpu` would still choose it and then crash.
+    pub power_preference: PowerPreference,
+
     /// Overrides the scale factor for the window. This is useful for making
     /// egui independent of the system UI scaling.
     pub scale_factor_override: Option<f32>,
@@ -131,6 +144,8 @@ impl Default for GameConfig {
             resolution,
             min_resolution,
 
+            power_preference: PowerPreference::None,
+
             scale_factor_override: None,
             fullscreen: false,
 

comfy-wgpu/src/device.rs

@@ -28,8 +28,9 @@ pub async fn create_graphics_context(
 
     let adapter = instance
         .request_adapter(&wgpu::RequestAdapterOptions {
-            // TODO: make this configurable
-            power_preference: wgpu::PowerPreference::HighPerformance,
+            power_preference: power_preference_to_wgpu(
+                game_config().power_preference,
+            ),
             compatible_surface: Some(&surface),
             force_fallback_adapter: false,
         })

comfy-wgpu/src/lib.rs

@@ -104,6 +104,18 @@ impl BufferType {
     }
 }
 
+pub fn power_preference_to_wgpu(
+    pref: PowerPreference,
+) -> wgpu::PowerPreference {
+    match pref {
+        PowerPreference::None => wgpu::PowerPreference::None,
+        PowerPreference::LowPower => wgpu::PowerPreference::LowPower,
+        PowerPreference::HighPerformance => {
+            wgpu::PowerPreference::HighPerformance
+        }
+    }
+}
+
 pub struct UniformBindGroup {
     pub bind_group: wgpu::BindGroup,
     pub layout: wgpu::BindGroupLayout,