From 36d48cef50adf1d26fe42dc4859ecae4e82a0acc Mon Sep 17 00:00:00 2001 From: Moonlacer <79172044+Moonlacer@users.noreply.github.com> Date: Sun, 30 Jul 2023 00:21:51 -0500 Subject: [PATCH 1/5] Revert "Revert "Blacklist EDS3 blending from new AMD drivers"" --- src/video_core/vulkan_common/vulkan_device.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/video_core/vulkan_common/vulkan_device.cpp b/src/video_core/vulkan_common/vulkan_device.cpp index 9c6fbb918..e04852e01 100644 --- a/src/video_core/vulkan_common/vulkan_device.cpp +++ b/src/video_core/vulkan_common/vulkan_device.cpp @@ -554,6 +554,14 @@ Device::Device(VkInstance instance_, vk::PhysicalDevice physical_, VkSurfaceKHR } sets_per_pool = 64; + if (extensions.extended_dynamic_state3 && is_amd_driver && + properties.properties.driverVersion >= VK_MAKE_API_VERSION(0, 2, 0, 270)) { + LOG_WARNING(Render_Vulkan, + "AMD drivers after 23.5.2 have broken extendedDynamicState3ColorBlendEquation"); + features.extended_dynamic_state3.extendedDynamicState3ColorBlendEnable = false; + features.extended_dynamic_state3.extendedDynamicState3ColorBlendEquation = false; + dynamic_state3_blending = false; + } if (is_amd_driver) { // AMD drivers need a higher amount of Sets per Pool in certain circumstances like in XC2. sets_per_pool = 96; From f4e5d076197b64fcdaf2b1de4979fcd24ff09053 Mon Sep 17 00:00:00 2001 From: Moonlacer Date: Sun, 30 Jul 2023 04:01:29 -0500 Subject: [PATCH 2/5] Address feedback and change log warning --- src/video_core/vulkan_common/vulkan_device.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/video_core/vulkan_common/vulkan_device.cpp b/src/video_core/vulkan_common/vulkan_device.cpp index e04852e01..d965e8718 100644 --- a/src/video_core/vulkan_common/vulkan_device.cpp +++ b/src/video_core/vulkan_common/vulkan_device.cpp @@ -554,10 +554,10 @@ Device::Device(VkInstance instance_, vk::PhysicalDevice physical_, VkSurfaceKHR } sets_per_pool = 64; - if (extensions.extended_dynamic_state3 && is_amd_driver && - properties.properties.driverVersion >= VK_MAKE_API_VERSION(0, 2, 0, 270)) { + if (extensions.extended_dynamic_state3 && is_amd_driver && !features.shader_float16_int8.shaderFloat16 && + properties.properties.driverVersion >= VK_MAKE_API_VERSION(0, 2, 0, 258)) { LOG_WARNING(Render_Vulkan, - "AMD drivers after 23.5.2 have broken extendedDynamicState3ColorBlendEquation"); + "AMD's GCN4 architecture has broken extendedDynamicState3ColorBlendEquation"); features.extended_dynamic_state3.extendedDynamicState3ColorBlendEnable = false; features.extended_dynamic_state3.extendedDynamicState3ColorBlendEquation = false; dynamic_state3_blending = false; From a4a106bb25f40027874323ef23eb097cc5be625a Mon Sep 17 00:00:00 2001 From: Moonlacer Date: Sun, 30 Jul 2023 04:29:51 -0500 Subject: [PATCH 3/5] Formatting fix --- src/video_core/vulkan_common/vulkan_device.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/video_core/vulkan_common/vulkan_device.cpp b/src/video_core/vulkan_common/vulkan_device.cpp index d965e8718..cd6b06999 100644 --- a/src/video_core/vulkan_common/vulkan_device.cpp +++ b/src/video_core/vulkan_common/vulkan_device.cpp @@ -554,7 +554,8 @@ Device::Device(VkInstance instance_, vk::PhysicalDevice physical_, VkSurfaceKHR } sets_per_pool = 64; - if (extensions.extended_dynamic_state3 && is_amd_driver && !features.shader_float16_int8.shaderFloat16 && + if (extensions.extended_dynamic_state3 && is_amd_driver && + !features.shader_float16_int8.shaderFloat16 && properties.properties.driverVersion >= VK_MAKE_API_VERSION(0, 2, 0, 258)) { LOG_WARNING(Render_Vulkan, "AMD's GCN4 architecture has broken extendedDynamicState3ColorBlendEquation"); From c6458970ad303236431586d0cee38e3af403553b Mon Sep 17 00:00:00 2001 From: Moonlacer Date: Sun, 30 Jul 2023 22:50:22 -0500 Subject: [PATCH 4/5] Match log warning --- src/video_core/vulkan_common/vulkan_device.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/video_core/vulkan_common/vulkan_device.cpp b/src/video_core/vulkan_common/vulkan_device.cpp index cd6b06999..11508688a 100644 --- a/src/video_core/vulkan_common/vulkan_device.cpp +++ b/src/video_core/vulkan_common/vulkan_device.cpp @@ -558,7 +558,7 @@ Device::Device(VkInstance instance_, vk::PhysicalDevice physical_, VkSurfaceKHR !features.shader_float16_int8.shaderFloat16 && properties.properties.driverVersion >= VK_MAKE_API_VERSION(0, 2, 0, 258)) { LOG_WARNING(Render_Vulkan, - "AMD's GCN4 architecture has broken extendedDynamicState3ColorBlendEquation"); + "AMD GCN4 has broken extendedDynamicState3ColorBlendEquation"); features.extended_dynamic_state3.extendedDynamicState3ColorBlendEnable = false; features.extended_dynamic_state3.extendedDynamicState3ColorBlendEquation = false; dynamic_state3_blending = false; From deafa92122d304920119ad9f079574887c810dd9 Mon Sep 17 00:00:00 2001 From: Moonlacer Date: Sun, 30 Jul 2023 23:02:07 -0500 Subject: [PATCH 5/5] Formatting fix --- src/video_core/vulkan_common/vulkan_device.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/video_core/vulkan_common/vulkan_device.cpp b/src/video_core/vulkan_common/vulkan_device.cpp index 11508688a..78918f996 100644 --- a/src/video_core/vulkan_common/vulkan_device.cpp +++ b/src/video_core/vulkan_common/vulkan_device.cpp @@ -557,8 +557,7 @@ Device::Device(VkInstance instance_, vk::PhysicalDevice physical_, VkSurfaceKHR if (extensions.extended_dynamic_state3 && is_amd_driver && !features.shader_float16_int8.shaderFloat16 && properties.properties.driverVersion >= VK_MAKE_API_VERSION(0, 2, 0, 258)) { - LOG_WARNING(Render_Vulkan, - "AMD GCN4 has broken extendedDynamicState3ColorBlendEquation"); + LOG_WARNING(Render_Vulkan, "AMD GCN4 has broken extendedDynamicState3ColorBlendEquation"); features.extended_dynamic_state3.extendedDynamicState3ColorBlendEnable = false; features.extended_dynamic_state3.extendedDynamicState3ColorBlendEquation = false; dynamic_state3_blending = false;