Add deviceUUID filter with DXVK_FILTER_DEVICE_UUID

doitsujin · meladath · Dec 22, 2021 · Mar 20, 2022 · Mar 20, 2022 · Mar 20, 2022
commit fb9329032a276dd1160f9bb12e1cc37837104371
diff --git a/src/dxvk/dxvk_device_filter.cpp b/src/dxvk/dxvk_device_filter.cpp
@@ -1,13 +1,25 @@
 #include "dxvk_device_filter.h"
 
+std::string convertUUID(const uint8_t* uuid) {
+    std::ostringstream convert;
+    for (int a = 0; a < 16; a++) {
+        convert << static_cast<int>(uuid[a]);
+    }
+    std::string key_string = convert.str();
+    return key_string;
+}
+
 namespace dxvk {
 
   DxvkDeviceFilter::DxvkDeviceFilter(DxvkDeviceFilterFlags flags)
   : m_flags(flags) {
     m_matchDeviceName = env::getEnvVar("DXVK_FILTER_DEVICE_NAME");
+    m_matchDeviceUUID = env::getEnvVar("DXVK_FILTER_DEVICE_UUID");
 
     if (m_matchDeviceName.size() != 0)
       m_flags.set(DxvkDeviceFilterFlag::MatchDeviceName);
+    if (m_matchDeviceUUID.size() != 0)
+      m_flags.set(DxvkDeviceFilterFlag::MatchDeviceUUID);
   }
 
 
@@ -36,5 +48,14 @@ namespace dxvk {
 
     return true;
   }
+
+  bool DxvkDeviceFilter::testCreatedAdapter(const DxvkDeviceInfo& deviceInfo) const {
+    if (m_flags.test(DxvkDeviceFilterFlag::MatchDeviceUUID)) {
+      if (convertUUID(deviceInfo.coreDeviceId.deviceUUID).find(m_matchDeviceUUID) == std::string::npos)
+        return false;
+    }
+
+    return true;
+  }
 
 }
diff --git a/src/dxvk/dxvk_device_filter.h b/src/dxvk/dxvk_device_filter.h
@@ -13,7 +13,8 @@ namespace dxvk {
    */
   enum class DxvkDeviceFilterFlag {
     MatchDeviceName   = 0,
-    SkipCpuDevices    = 1,
+    MatchDeviceUUID   = 1,
+    SkipCpuDevices    = 2,
   };
 
   using DxvkDeviceFilterFlags = Flags<DxvkDeviceFilterFlag>;
@@ -42,13 +43,23 @@ namespace dxvk {
      */
     bool testAdapter(
       const VkPhysicalDeviceProperties& properties) const;
+
+    /**
+     * \brief Tests a created adapter
+     *
+     * \param [in] properties Adapter properties
+     * \returns \c true if the test passes
+     */
+    bool testCreatedAdapter(
+      const DxvkDeviceInfo& deviceInfo) const;
 
   private:
 
     DxvkDeviceFilterFlags m_flags;
 
     std::string m_matchDeviceName;
+    std::string m_matchDeviceUUID;
 
   };
 
-}
+}
diff --git a/src/dxvk/dxvk_instance.cpp b/src/dxvk/dxvk_instance.cpp
@@ -178,6 +178,8 @@ namespace dxvk {
     for (uint32_t i = 0; i < numAdapters; i++) {
       if (filter.testAdapter(deviceProperties[i]))
         result.push_back(new DxvkAdapter(m_vki, adapters[i]));
+      if(!filter.testCreatedAdapter(result.back()->devicePropertiesExt()))
+        result.pop_back();
     }
 
     std::stable_sort(result.begin(), result.end(),