From 42435d1864213deab6dc8fb72477459831a71493 Mon Sep 17 00:00:00 2001
From: Ashley Wulber <ashley@system76.com>
Date: Mon, 20 Apr 2026 12:16:44 -0400
Subject: [PATCH] improv(wgpu): adapter selection

---
 wgpu/src/window/compositor.rs | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/wgpu/src/window/compositor.rs b/wgpu/src/window/compositor.rs
index 833a642e6e..2cb58ca7b0 100644
--- a/wgpu/src/window/compositor.rs
+++ b/wgpu/src/window/compositor.rs
@@ -76,18 +76,23 @@ impl Compositor {
                 .or_else(|| get_x11_device_ids(window))
         });
 
+        #[cfg(all(
+            unix,
+            not(feature = "cctk"),
+            not(target_os = "macos"),
+            not(target_os = "redox")
+        ))]
+        let ids = compatible_window
+            .as_ref()
+            .and_then(|window| get_x11_device_ids(window));
+
         // HACK:
         //  1. If we specifically didn't select an nvidia gpu
         //  2. and the user didn't specifically request an nvidia gpu
         //  3. and the user didn't set an adapter name,
         //  4. and the user didn't request the high power pref
         // => don't load the nvidia icd, as it might power on the gpu in hybrid setups causing severe delays
-        #[cfg(all(
-            unix,
-            feature = "cctk",
-            not(target_os = "macos"),
-            not(target_os = "redox")
-        ))]
+        #[cfg(all(unix, not(target_os = "macos"), not(target_os = "redox")))]
         if !matches!(ids, Some((0x10de, _)))
             && std::env::var_os("__NV_PRIME_RENDER_OFFLOAD")
                 .is_none_or(|var| var == "0")
@@ -148,7 +153,6 @@ impl Compositor {
         if std::env::var_os("WGPU_ADAPTER_NAME").is_none() {
             #[cfg(all(
                 unix,
-                feature = "cctk",
                 not(target_os = "macos"),
                 not(target_os = "redox")
             ))]
@@ -184,6 +188,8 @@ impl Compositor {
                         true
                     }
                 });
+        } else {
+            adapter = instance.request_adapter(&adapter_options).await.ok();
         }
 
         let adapter = match adapter {