diff options
| author | MatÃas Locatti <42481638+goldenx86@users.noreply.github.com> | 2023-05-26 17:36:37 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-26 17:36:37 -0300 |
| commit | d6db422098ad12d95396a23f60f005893eb9b720 (patch) | |
| tree | c710055fdb7dddfe1d8487b1295dee645479b0fd | |
| parent | 919b54848b4043265ce67bd15ca25651a223b0a5 (diff) | |
| parent | 8bba9f7deaa78c523fbf12a1b10f4428436479ec (diff) | |
Merge pull request #10414 from liamwhite/anv-push-descriptor
vulkan_device: Enable VK_KHR_push_descriptor on newer ANV
| -rw-r--r-- | src/video_core/vulkan_common/vulkan_device.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/video_core/vulkan_common/vulkan_device.cpp b/src/video_core/vulkan_common/vulkan_device.cpp index 3a7c2dedf..aea677cb3 100644 --- a/src/video_core/vulkan_common/vulkan_device.cpp +++ b/src/video_core/vulkan_common/vulkan_device.cpp @@ -473,11 +473,12 @@ Device::Device(VkInstance instance_, vk::PhysicalDevice physical_, VkSurfaceKHR } 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)) { + if (version >= VK_MAKE_API_VERSION(0, 22, 3, 0) && + version < VK_MAKE_API_VERSION(0, 23, 2, 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"); + "ANV drivers 22.3.0 to 23.1.0 have broken VK_KHR_push_descriptor"); extensions.push_descriptor = false; loaded_extensions.erase(VK_KHR_PUSH_DESCRIPTOR_EXTENSION_NAME); } |