summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Fernando S2022-06-30 08:48:32 +0200
committerGravatar GitHub2022-06-30 08:48:32 +0200
commit4ef66ec8fbb8c863db9063fe2bd332f22a5748ee (patch)
tree5e6693ed56cdca5c3e7b790a4a9d937b81393ccc
parentMerge pull request #8512 from german77/nnResult (diff)
parentRevert "vulkan_device: Block AMDVLK's VK_KHR_push_descriptor" (diff)
downloadyuzu-4ef66ec8fbb8c863db9063fe2bd332f22a5748ee.tar.gz
yuzu-4ef66ec8fbb8c863db9063fe2bd332f22a5748ee.tar.xz
yuzu-4ef66ec8fbb8c863db9063fe2bd332f22a5748ee.zip
Merge pull request #8518 from yuzu-emu/revert-8379-amd-push-desc-workaround
Revert "vulkan_device: Block AMDVLK's VK_KHR_push_descriptor"
-rw-r--r--src/video_core/vulkan_common/vulkan_device.cpp11
1 files changed, 0 insertions, 11 deletions
diff --git a/src/video_core/vulkan_common/vulkan_device.cpp b/src/video_core/vulkan_common/vulkan_device.cpp
index 11ce865a7..743ac09f6 100644
--- a/src/video_core/vulkan_common/vulkan_device.cpp
+++ b/src/video_core/vulkan_common/vulkan_device.cpp
@@ -669,17 +669,6 @@ Device::Device(VkInstance instance_, vk::PhysicalDevice physical_, VkSurfaceKHR
669 const bool is_amd = 669 const bool is_amd =
670 driver_id == VK_DRIVER_ID_AMD_PROPRIETARY || driver_id == VK_DRIVER_ID_AMD_OPEN_SOURCE; 670 driver_id == VK_DRIVER_ID_AMD_PROPRIETARY || driver_id == VK_DRIVER_ID_AMD_OPEN_SOURCE;
671 if (is_amd) { 671 if (is_amd) {
672 // TODO(lat9nq): Add an upper bound when AMD fixes their VK_KHR_push_descriptor
673 const bool has_broken_push_descriptor = VK_VERSION_MAJOR(properties.driverVersion) == 2 &&
674 VK_VERSION_MINOR(properties.driverVersion) == 0 &&
675 VK_VERSION_PATCH(properties.driverVersion) >= 226;
676 if (khr_push_descriptor && has_broken_push_descriptor) {
677 LOG_WARNING(
678 Render_Vulkan,
679 "Disabling AMD driver 2.0.226 and later from broken VK_KHR_push_descriptor");
680 khr_push_descriptor = false;
681 }
682
683 // AMD drivers need a higher amount of Sets per Pool in certain circunstances like in XC2. 672 // AMD drivers need a higher amount of Sets per Pool in certain circunstances like in XC2.
684 sets_per_pool = 96; 673 sets_per_pool = 96;
685 // Disable VK_IMAGE_CREATE_CUBE_COMPATIBLE_BIT on AMD GCN4 and lower as it is broken. 674 // Disable VK_IMAGE_CREATE_CUBE_COMPATIBLE_BIT on AMD GCN4 and lower as it is broken.