From 7f53cd1e96a990154d1799a6ca73f837b53e9fc5 Mon Sep 17 00:00:00 2001
From: lat9nq <lat9nq@gmail.com>
Date: Wed, 25 May 2022 01:01:14 -0400
Subject: [PATCH] vulkan_device: Block AMDVLK's VK_KHR_push_descriptor
Recent AMD Vulkan drivers (22.5.2 or 2.0.226 for specifically Vulkan)
have a broken VK_KHR_push_descriptor implementation that causes a crash
in yuzu. Disable it for the time being.
---
src/video_core/vulkan_common/vulkan_device.cpp | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/src/video_core/vulkan_common/vulkan_device.cpp b/src/video_core/vulkan_common/vulkan_device.cpp
index 7b2ca8046a..2ddf0b104d 100644
--- a/src/video_core/vulkan_common/vulkan_device.cpp
+++ b/src/video_core/vulkan_common/vulkan_device.cpp
@@ -664,6 +664,17 @@ Device::Device(VkInstance instance_, vk::PhysicalDevice physical_, VkSurfaceKHR
const bool is_amd =
driver_id == VK_DRIVER_ID_AMD_PROPRIETARY || driver_id == VK_DRIVER_ID_AMD_OPEN_SOURCE;
if (is_amd) {
+ // TODO(lat9nq): Add an upper bound when AMD fixes their VK_KHR_push_descriptor
+ const bool has_broken_push_descriptor = VK_VERSION_MAJOR(properties.driverVersion) == 2 &&
+ VK_VERSION_MINOR(properties.driverVersion) == 0 &&
+ VK_VERSION_PATCH(properties.driverVersion) >= 226;
+ if (khr_push_descriptor && has_broken_push_descriptor) {
+ LOG_WARNING(
+ Render_Vulkan,
+ "Disabling AMD driver 2.0.226 and later from broken VK_KHR_push_descriptor");
+ khr_push_descriptor = false;
+ }
+
// AMD drivers need a higher amount of Sets per Pool in certain circunstances like in XC2.
sets_per_pool = 96;
// Disable VK_IMAGE_CREATE_CUBE_COMPATIBLE_BIT on AMD GCN4 and lower as it is broken.