From 1f0328c5d5fc4ba60e552734a3e545ed5c0643d7 Mon Sep 17 00:00:00 2001 From: kd-11 Date: Tue, 24 Jun 2025 03:59:29 +0300 Subject: [PATCH] vk: Fix up binding layouts for some broken shaders --- rpcs3/Emu/RSX/Program/GLSLSnippets/OverlayRenderFS.glsl | 4 ++-- rpcs3/Emu/RSX/VK/VKOverlays.cpp | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/rpcs3/Emu/RSX/Program/GLSLSnippets/OverlayRenderFS.glsl b/rpcs3/Emu/RSX/Program/GLSLSnippets/OverlayRenderFS.glsl index de1992174f..84fdfdb8b7 100644 --- a/rpcs3/Emu/RSX/Program/GLSLSnippets/OverlayRenderFS.glsl +++ b/rpcs3/Emu/RSX/Program/GLSLSnippets/OverlayRenderFS.glsl @@ -14,8 +14,8 @@ R"( #define SAMPLER_MODE_TEXTURE2D 3 #ifdef VULKAN - layout(set=0, binding=1) uniform sampler2D fs0; - layout(set=0, binding=2) uniform sampler2DArray fs1; + layout(set=0, binding=0) uniform sampler2D fs0; + layout(set=0, binding=1) uniform sampler2DArray fs1; #else layout(binding=31) uniform sampler2D fs0; layout(binding=30) uniform sampler2DArray fs1; diff --git a/rpcs3/Emu/RSX/VK/VKOverlays.cpp b/rpcs3/Emu/RSX/VK/VKOverlays.cpp index 743339e26c..70d9a7ab49 100644 --- a/rpcs3/Emu/RSX/VK/VKOverlays.cpp +++ b/rpcs3/Emu/RSX/VK/VKOverlays.cpp @@ -310,6 +310,7 @@ namespace vk // 2 input textures m_num_usable_samplers = 2; + m_num_uniform_buffers = 0; renderpass_config.set_attachment_count(1); renderpass_config.set_color_mask(0, true, true, true, true); @@ -807,6 +808,9 @@ namespace vk "{\n" " out_color = vec4(0.);\n" "}\n"; + + m_num_uniform_buffers = 0; + m_num_usable_samplers = 0; } void stencil_clear_pass::set_up_viewport(vk::command_buffer& cmd, u32 x, u32 y, u32 w, u32 h) @@ -865,6 +869,7 @@ namespace vk renderpass_config.set_attachment_count(1); m_num_usable_samplers = 2; + m_num_uniform_buffers = 0; } std::vector video_out_calibration_pass::get_fragment_inputs()