stupid test

src/platform/windows/display_base.cpp

@@ -353,7 +353,7 @@ namespace platf::dxgi {
     return true;
   }
 
-  bool
+  std::optional<int>
   validate_and_test_gpu_preference(const std::string &display_name, bool verify_frame_capture) {
     std::string cmd = "tools\\ddprobe.exe";
 
@@ -375,7 +375,7 @@ namespace platf::dxgi {
       }
       catch (bp::process_error &e) {
         BOOST_LOG(error) << "Failed to start ddprobe.exe: "sv << e.what();
-        return false;
+        return std::nullopt;
       }
 
       BOOST_LOG(info) << "ddprobe.exe " << boost::algorithm::join(args, " ") << " returned 0x"
@@ -387,16 +387,13 @@ namespace platf::dxgi {
       if (result == S_OK || result == E_ACCESSDENIED) {
         // We found a working GPU preference, so set ourselves to use that.
         if (set_gpu_preference_on_self(i)) {
-          return true;
-        }
-        else {
-          return false;
+          return i;
         }
       }
     }
 
     // If no valid configuration was found, return false
-    return false;
+    return std::nullopt;
   }
 
   // On hybrid graphics systems, Windows will change the order of GPUs reported by
@@ -411,22 +408,22 @@ namespace platf::dxgi {
   // we spawn a helper tool to probe for us before we set our own GPU preference.
   bool
   probe_for_gpu_preference(const std::string &display_name) {
-    static bool set_gpu_preference = false;
+    static std::map<std::string, int> gpu_preference;
 
-    // If we've already been through here, there's nothing to do this time.
-    if (set_gpu_preference) {
-      return true;
+    // If we've already been through here, there's no need to test for preference again.
+    if (const auto pref_it { gpu_preference.find(display_name) }; pref_it != gpu_preference.end()) {
+      return set_gpu_preference_on_self(pref_it->second);
     }
 
     // Try probing with different GPU preferences and verify_frame_capture flag
-    if (validate_and_test_gpu_preference(display_name, true)) {
-      set_gpu_preference = true;
+    if (const auto pref = validate_and_test_gpu_preference(display_name, true); pref) {
+      gpu_preference.emplace(display_name, *pref);
       return true;
     }
 
     // If no valid configuration was found, try again with verify_frame_capture == false
-    if (validate_and_test_gpu_preference(display_name, false)) {
-      set_gpu_preference = true;
+    if (const auto pref = validate_and_test_gpu_preference(display_name, false); pref) {
+      gpu_preference.emplace(display_name, *pref);
       return true;
     }