VERY experimental Nintendo Switch 2 emulator
C++
renderer_vulkan: exclude more qcom drivers from extensions
Liam2ccd5473099b
diff --git a/src/video_core/renderer_vulkan/vk_rasterizer.cpp b/src/video_core/renderer_vulkan/vk_rasterizer.cppindex e0ab1eaacd..07222e603b 100644--- a/src/video_core/renderer_vulkan/vk_rasterizer.cpp+++ b/src/video_core/renderer_vulkan/vk_rasterizer.cpp@@ -892,10 +892,6 @@ void RasterizerVulkan::UpdateDynamicStates() {UpdateFrontFace(regs);UpdateStencilOp(regs);- if (device.IsExtVertexInputDynamicStateSupported()) {- UpdateVertexInput(regs);- }-if (state_tracker.TouchStateEnable()) {UpdateDepthBoundsTestEnable(regs);UpdateDepthTestEnable(regs);@@ -918,6 +914,9 @@ void RasterizerVulkan::UpdateDynamicStates() {UpdateBlending(regs);}}+ if (device.IsExtVertexInputDynamicStateSupported()) {+ UpdateVertexInput(regs);+ }}void RasterizerVulkan::HandleTransformFeedback() {diff --git a/src/video_core/vulkan_common/vulkan_device.cpp b/src/video_core/vulkan_common/vulkan_device.cppindex 188ceeed70..1fda0042d7 100644--- a/src/video_core/vulkan_common/vulkan_device.cpp+++ b/src/video_core/vulkan_common/vulkan_device.cpp@@ -519,10 +519,6 @@ Device::Device(VkInstance instance_, vk::PhysicalDevice physical_, VkSurfaceKHRLOG_WARNING(Render_Vulkan, "ARM drivers have broken VK_EXT_extended_dynamic_state");RemoveExtensionFeature(extensions.extended_dynamic_state, features.extended_dynamic_state,VK_EXT_EXTENDED_DYNAMIC_STATE_EXTENSION_NAME);-- LOG_WARNING(Render_Vulkan, "ARM drivers have broken VK_EXT_extended_dynamic_state2");- RemoveExtensionFeature(extensions.extended_dynamic_state2, features.extended_dynamic_state2,- VK_EXT_EXTENDED_DYNAMIC_STATE_2_EXTENSION_NAME);}if (is_nvidia) {@@ -611,17 +607,12 @@ Device::Device(VkInstance instance_, vk::PhysicalDevice physical_, VkSurfaceKHR}}if (extensions.vertex_input_dynamic_state && is_qualcomm) {- const u32 version = (properties.properties.driverVersion << 3) >> 3;- if (version >= VK_MAKE_API_VERSION(0, 0, 676, 0) &&- version < VK_MAKE_API_VERSION(0, 0, 680, 0)) {- // Qualcomm Adreno 7xx drivers do not properly support vertex_input_dynamic_state.- LOG_WARNING(- Render_Vulkan,- "Qualcomm Adreno 7xx drivers have broken VK_EXT_vertex_input_dynamic_state");- RemoveExtensionFeature(extensions.vertex_input_dynamic_state,- features.vertex_input_dynamic_state,- VK_EXT_VERTEX_INPUT_DYNAMIC_STATE_EXTENSION_NAME);- }+ // Qualcomm drivers do not properly support vertex_input_dynamic_state.+ LOG_WARNING(Render_Vulkan,+ "Qualcomm drivers have broken VK_EXT_vertex_input_dynamic_state");+ RemoveExtensionFeature(extensions.vertex_input_dynamic_state,+ features.vertex_input_dynamic_state,+ VK_EXT_VERTEX_INPUT_DYNAMIC_STATE_EXTENSION_NAME);}sets_per_pool = 64;@@ -704,6 +695,22 @@ Device::Device(VkInstance instance_, vk::PhysicalDevice physical_, VkSurfaceKHRstd::min(properties.properties.limits.maxVertexInputBindings, 16U);}+ if (!extensions.extended_dynamic_state && extensions.extended_dynamic_state2) {+ LOG_INFO(Render_Vulkan,+ "Removing extendedDynamicState2 due to missing extendedDynamicState");+ RemoveExtensionFeature(extensions.extended_dynamic_state2, features.extended_dynamic_state2,+ VK_EXT_EXTENDED_DYNAMIC_STATE_2_EXTENSION_NAME);+ }++ if (!extensions.extended_dynamic_state2 && extensions.extended_dynamic_state3) {+ LOG_INFO(Render_Vulkan,+ "Removing extendedDynamicState3 due to missing extendedDynamicState2");+ RemoveExtensionFeature(extensions.extended_dynamic_state3, features.extended_dynamic_state3,+ VK_EXT_EXTENDED_DYNAMIC_STATE_3_EXTENSION_NAME);+ dynamic_state3_blending = false;+ dynamic_state3_enables = false;+ }+logical = vk::Device::Create(physical, queue_cis, ExtensionListForVulkan(loaded_extensions),first_next, dld);