summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatías Locatti <42481638+goldenx86@users.noreply.github.com>2023-05-26 22:36:37 +0200
committerGitHub <noreply@github.com>2023-05-26 22:36:37 +0200
commitd6db422098ad12d95396a23f60f005893eb9b720 (patch)
treec710055fdb7dddfe1d8487b1295dee645479b0fd
parentMerge pull request #10418 from liamwhite/blink-and-youll-miss-it (diff)
parentvulkan_device: Enable VK_KHR_push_descriptor on newer ANV (diff)
downloadyuzu-d6db422098ad12d95396a23f60f005893eb9b720.tar
yuzu-d6db422098ad12d95396a23f60f005893eb9b720.tar.gz
yuzu-d6db422098ad12d95396a23f60f005893eb9b720.tar.bz2
yuzu-d6db422098ad12d95396a23f60f005893eb9b720.tar.lz
yuzu-d6db422098ad12d95396a23f60f005893eb9b720.tar.xz
yuzu-d6db422098ad12d95396a23f60f005893eb9b720.tar.zst
yuzu-d6db422098ad12d95396a23f60f005893eb9b720.zip
-rw-r--r--src/video_core/vulkan_common/vulkan_device.cpp5
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);
}