VERY experimental Nintendo Switch 2 emulator
C++
Vulkan: Fix drivers that don't support dynamic_state_2 up
Fernando Sahmkow660ea18f85cd
diff --git a/src/video_core/renderer_vulkan/fixed_pipeline_state.cpp b/src/video_core/renderer_vulkan/fixed_pipeline_state.cppindex 3d328a2504..f8398b5111 100644--- a/src/video_core/renderer_vulkan/fixed_pipeline_state.cpp+++ b/src/video_core/renderer_vulkan/fixed_pipeline_state.cpp@@ -148,7 +148,7 @@ void FixedPipelineState::Refresh(Tegra::Engines::Maxwell3D& maxwell3d, DynamicFe});}if (!extended_dynamic_state_2_extra) {- dynamic_state.Refresh2(regs, topology, extended_dynamic_state_2);+ dynamic_state.Refresh2(regs, topology_, extended_dynamic_state_2);}if (!extended_dynamic_state_3_blend) {if (maxwell3d.dirty.flags[Dirty::Blending]) {diff --git a/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp b/src/video_core/renderer_vulkan/vk_graphics_pipeline.cppindex d11383bf19..734c379b99 100644--- a/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp+++ b/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp@@ -644,12 +644,15 @@ void GraphicsPipeline::MakePipeline(VkRenderPass render_pass) {.pNext = nullptr,.flags = 0,.topology = input_assembly_topology,- .primitiveRestartEnable = dynamic.primitive_restart_enable != 0 &&- ((input_assembly_topology != VK_PRIMITIVE_TOPOLOGY_PATCH_LIST &&- device.IsTopologyListPrimitiveRestartSupported()) ||- SupportsPrimitiveRestart(input_assembly_topology) ||- (input_assembly_topology == VK_PRIMITIVE_TOPOLOGY_PATCH_LIST &&- device.IsPatchListPrimitiveRestartSupported())),+ .primitiveRestartEnable =+ dynamic.primitive_restart_enable != 0 &&+ ((input_assembly_topology != VK_PRIMITIVE_TOPOLOGY_PATCH_LIST &&+ device.IsTopologyListPrimitiveRestartSupported()) ||+ SupportsPrimitiveRestart(input_assembly_topology) ||+ (input_assembly_topology == VK_PRIMITIVE_TOPOLOGY_PATCH_LIST &&+ device.IsPatchListPrimitiveRestartSupported()))+ ? VK_TRUE+ : VK_FALSE,};const VkPipelineTessellationStateCreateInfo tessellation_ci{.sType = VK_STRUCTURE_TYPE_PIPELINE_TESSELLATION_STATE_CREATE_INFO,@@ -699,7 +702,7 @@ void GraphicsPipeline::MakePipeline(VkRenderPass render_pass) {.cullMode = static_cast<VkCullModeFlags>(dynamic.cull_enable ? MaxwellToVK::CullFace(dynamic.CullFace()) : VK_CULL_MODE_NONE),.frontFace = MaxwellToVK::FrontFace(dynamic.FrontFace()),- .depthBiasEnable = (dynamic.depth_bias_enable == 0 ? VK_TRUE : VK_FALSE),+ .depthBiasEnable = (dynamic.depth_bias_enable != 0 ? VK_TRUE : VK_FALSE),.depthBiasConstantFactor = 0.0f,.depthBiasClamp = 0.0f,.depthBiasSlopeFactor = 0.0f,