From ce5143186085ccf7bd653c90dd81b7b058670f29 Mon Sep 17 00:00:00 2001
From: Philip Rebohle <philip.rebohle@tu-dortmund.de>
Date: Mon, 3 Feb 2020 11:30:39 +0100
Subject: [PATCH] [dxvk] Skip over adapters not supporting Vulkan 1.1

Even with a 1.1 instance it appears to be possible to retrieve 1.0
adapters, so we'll just ignore them.
---
 src/dxvk/dxvk_device_filter.cpp |  9 +++------
 src/dxvk/dxvk_device_filter.h   |  4 ++--
 src/dxvk/dxvk_instance.cpp      | 11 +++++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/dxvk/dxvk_device_filter.cpp b/src/dxvk/dxvk_device_filter.cpp
index 62e617a4b..29f40de70 100644
--- a/src/dxvk/dxvk_device_filter.cpp
+++ b/src/dxvk/dxvk_device_filter.cpp
@@ -15,15 +15,12 @@ namespace dxvk {
   }
   
   
-  bool DxvkDeviceFilter::testAdapter(
-    const Rc<DxvkAdapter>&  adapter) const {
-    const auto& deviceProps = adapter->deviceProperties();
-    
+  bool DxvkDeviceFilter::testAdapter(const VkPhysicalDeviceProperties& properties) const {
     if (m_flags.test(DxvkDeviceFilterFlag::MatchDeviceName)) {
-      if (std::string (deviceProps.deviceName).find(m_matchDeviceName) == std::string::npos)
+      if (std::string(properties.deviceName).find(m_matchDeviceName) == std::string::npos)
         return false;
     }
-      
+
     return true;
   }
   
diff --git a/src/dxvk/dxvk_device_filter.h b/src/dxvk/dxvk_device_filter.h
index b22da7e8a..a0cb9d04e 100644
--- a/src/dxvk/dxvk_device_filter.h
+++ b/src/dxvk/dxvk_device_filter.h
@@ -36,11 +36,11 @@ namespace dxvk {
     /**
      * \brief Tests an adapter
      * 
-     * \param [in] adapter Adapter handle
+     * \param [in] properties Adapter properties
      * \returns \c true if the test passes
      */
     bool testAdapter(
-      const Rc<DxvkAdapter>&  adapter) const;
+      const VkPhysicalDeviceProperties& properties) const;
     
   private:
     
diff --git a/src/dxvk/dxvk_instance.cpp b/src/dxvk/dxvk_instance.cpp
index e9f706675..91d361d81 100644
--- a/src/dxvk/dxvk_instance.cpp
+++ b/src/dxvk/dxvk_instance.cpp
@@ -154,10 +154,13 @@ namespace dxvk {
     
     std::vector<Rc<DxvkAdapter>> result;
     for (uint32_t i = 0; i < numAdapters; i++) {
-      Rc<DxvkAdapter> adapter = new DxvkAdapter(m_vki, adapters[i]);
-      
-      if (filter.testAdapter(adapter))
-        result.push_back(adapter);
+      VkPhysicalDeviceProperties deviceProperties;
+      m_vki->vkGetPhysicalDeviceProperties(adapters[i], &deviceProperties);
+
+      if (deviceProperties.apiVersion < VK_MAKE_VERSION(1, 1, 0))
+        Logger::warn(str::format("Skipping Vulkan 1.0 adapter: ", deviceProperties.deviceName));
+      else if (filter.testAdapter(deviceProperties))
+        result.push_back(new DxvkAdapter(m_vki, adapters[i]));
     }
     
     std::sort(result.begin(), result.end(),