Selaa lähdekoodia

Merge pull request #10365 from lat9nq/anv_push_descriptor

vulkan_device: Disable VK_KHR_push_descriptor on ANV
Matías Locatti 3 vuotta sitten
vanhempi
commit
f35c14fb73
1 muutettua tiedostoa jossa 11 lisäystä ja 0 poistoa
  1. 11 0
      src/video_core/vulkan_common/vulkan_device.cpp

+ 11 - 0
src/video_core/vulkan_common/vulkan_device.cpp

@@ -471,6 +471,17 @@ Device::Device(VkInstance instance_, vk::PhysicalDevice physical_, VkSurfaceKHR
         LOG_WARNING(Render_Vulkan, "ANV driver does not support native BGR format");
         must_emulate_bgr565 = true;
     }
+    if (extensions.push_descriptor && is_intel_anv) {
+        const u32 version = (properties.properties.driverVersion << 3) >> 3;
+        if (version >= VK_MAKE_API_VERSION(0, 22, 3, 0)) {
+            // Disable VK_KHR_push_descriptor due to
+            // mesa/mesa/-/commit/ff91c5ca42bc80aa411cb3fd8f550aa6fdd16bdc
+            LOG_WARNING(Render_Vulkan,
+                        "ANV drivers 22.3.0 and later have broken VK_KHR_push_descriptor");
+            extensions.push_descriptor = false;
+            loaded_extensions.erase(VK_KHR_PUSH_DESCRIPTOR_EXTENSION_NAME);
+        }
+    }
     if (is_mvk) {
         LOG_WARNING(Render_Vulkan,
                     "MVK driver breaks when using more than 16 vertex attributes/bindings");