From 2421a8c26ed35614aa255d3b2120255ce1038783 Mon Sep 17 00:00:00 2001 From: CamilleLaVey Date: Wed, 15 Apr 2026 18:52:31 -0400 Subject: [PATCH] Revert "[vulkan] Adjusted pipeline keys inside patchControlPoints" --- src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp | 2 +- src/video_core/renderer_vulkan/vk_pipeline_cache.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp b/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp index 31f8cab38f..8f231a4352 100644 --- a/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp +++ b/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp @@ -677,7 +677,7 @@ void GraphicsPipeline::MakePipeline(VkRenderPass render_pass) { .sType = VK_STRUCTURE_TYPE_PIPELINE_TESSELLATION_STATE_CREATE_INFO, .pNext = nullptr, .flags = 0, - .patchControlPoints = static_cast(key.state.patch_control_points_minus_one.Value()) + 1, + .patchControlPoints = key.state.patch_control_points_minus_one.Value() + 1, }; std::array swizzles; std::ranges::transform(key.state.viewport_swizzles, swizzles.begin(), UnpackViewportSwizzle); diff --git a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp b/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp index e14d037858..bcfc4b8b4d 100644 --- a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp +++ b/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp @@ -195,7 +195,7 @@ Shader::RuntimeInfo MakeRuntimeInfo(std::span program case Shader::Stage::TessellationEval: info.tess_clockwise = key.state.tessellation_clockwise != 0; info.tess_primitive = [&key] { - const u32 raw = static_cast(key.state.tessellation_primitive.Value()); + const u32 raw{key.state.tessellation_primitive.Value()}; switch (static_cast(raw)) { case Maxwell::Tessellation::DomainType::Isolines: return Shader::TessPrimitive::Isolines; @@ -208,7 +208,7 @@ Shader::RuntimeInfo MakeRuntimeInfo(std::span program return Shader::TessPrimitive::Triangles; }(); info.tess_spacing = [&] { - const u32 raw = static_cast(key.state.tessellation_spacing.Value()); + const u32 raw{key.state.tessellation_spacing}; switch (static_cast(raw)) { case Maxwell::Tessellation::Spacing::Integer: return Shader::TessSpacing::Equal;