From a02e8a5679a953545a206207612e4339580df3d6 Mon Sep 17 00:00:00 2001 From: CamilleLaVey Date: Sun, 8 Mar 2026 19:52:20 -0400 Subject: [PATCH] [vulkan] Removed dynamic culling mode/ front face. --- src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp | 9 +-------- src/video_core/renderer_vulkan/vk_rasterizer.cpp | 4 +--- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp b/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp index 9923acdac4..8a96a11a22 100644 --- a/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp +++ b/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp @@ -576,12 +576,7 @@ void GraphicsPipeline::ConfigureDraw(const RescalingPushConstant& rescaling, } void GraphicsPipeline::MakePipeline(VkRenderPass render_pass) { - FixedPipelineState::DynamicState dynamic{}; - if (!key.state.extended_dynamic_state) { - dynamic = key.state.dynamic_state; - } else { - dynamic.raw1 = key.state.dynamic_state.raw1; - } + const FixedPipelineState::DynamicState dynamic{key.state.dynamic_state}; static_vector vertex_bindings; static_vector vertex_binding_divisors; static_vector vertex_attributes; @@ -906,8 +901,6 @@ void GraphicsPipeline::MakePipeline(VkRenderPass render_pass) { } if (key.state.extended_dynamic_state) { static constexpr std::array extended{ - VK_DYNAMIC_STATE_CULL_MODE_EXT, - VK_DYNAMIC_STATE_FRONT_FACE_EXT, VK_DYNAMIC_STATE_DEPTH_TEST_ENABLE_EXT, VK_DYNAMIC_STATE_DEPTH_WRITE_ENABLE_EXT, VK_DYNAMIC_STATE_DEPTH_COMPARE_OP_EXT, diff --git a/src/video_core/renderer_vulkan/vk_rasterizer.cpp b/src/video_core/renderer_vulkan/vk_rasterizer.cpp index 0d1f2f75bd..a8bbaadc33 100644 --- a/src/video_core/renderer_vulkan/vk_rasterizer.cpp +++ b/src/video_core/renderer_vulkan/vk_rasterizer.cpp @@ -1078,11 +1078,9 @@ void RasterizerVulkan::UpdateDynamicStates() { UpdateLineWidth(regs); UpdateLineStipple(regs); - // EDS1: CullMode, DepthCompare, FrontFace, StencilOp, DepthBoundsTest, DepthTest, DepthWrite, StencilTest + // EDS1: DepthCompare, StencilOp, DepthBoundsTest, DepthTest, DepthWrite, StencilTest if (device.IsExtExtendedDynamicStateSupported() && pipeline && pipeline->UsesExtendedDynamicState()) { - UpdateCullMode(regs); UpdateDepthCompareOp(regs); - UpdateFrontFace(regs); UpdateStencilOp(regs); if (state_tracker.TouchStateEnable()) { UpdateDepthBoundsTestEnable(regs);