RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-12-06 07:12:28 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

vk: Fix shader compilation for certain glslang versions

Browse source
This commit is contained in:
kd-11 2025-08-11 23:03:37 +03:00 committed by kd-11
parent 2275e689ce
commit 1a5ec26392
1 changed files with 19 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
rpcs3/Emu/RSX/VK/VKFragmentProgram.cpp
View file

@ -166,6 +166,25 @@ void VKFragmentDecompilerThread::insertOutputs(std::stringstream & OS)
void VKFragmentDecompilerThread::insertConstants(std::stringstream & OS) void VKFragmentDecompilerThread::insertConstants(std::stringstream & OS)
{ {
// Declare push constants first to fix preprocessor references
OS <<
"layout(push_constant) uniform push_constants_block\n"
"{\n"
" uint draw_parameters_offset;\n"
"};\n\n";
const vk::glsl::program_input push_constants
{
.domain = glsl::glsl_fragment_program,
.type = vk::glsl::input_type_push_constant,
.bound_data = vk::glsl::push_constant_ref{.offset = 0, .size = 4 },
.set = vk::glsl::binding_set_index_vertex,
.location = umax,
.name = "fs_push_constants_block"
};
inputs.push_back(push_constants);
// Fixed inputs from shader decompilation process
for (const ParamType& PT : m_parr.params[PF_PARAM_UNIFORM]) for (const ParamType& PT : m_parr.params[PF_PARAM_UNIFORM])
{ {
if (!PT.type.starts_with("sampler")) if (!PT.type.starts_with("sampler"))
@ -291,23 +310,6 @@ void VKFragmentDecompilerThread::insertConstants(std::stringstream & OS)
in.type = vk::glsl::input_type_storage_buffer; in.type = vk::glsl::input_type_storage_buffer;
in.name = "RasterizerHeap"; in.name = "RasterizerHeap";
inputs.push_back(in); inputs.push_back(in);
OS <<
"layout(push_constant) uniform push_constants_block\n"
"{\n"
" uint draw_parameters_offset;\n"
"};\n\n";
const vk::glsl::program_input push_constants
{
.domain = glsl::glsl_fragment_program,
.type = vk::glsl::input_type_push_constant,
.bound_data = vk::glsl::push_constant_ref{.offset = 0, .size = 4 },
.set = vk::glsl::binding_set_index_vertex,
.location = umax,
.name = "fs_push_constants_block"
};
inputs.push_back(push_constants);
} }
void VKFragmentDecompilerThread::insertGlobalFunctions(std::stringstream &OS) void VKFragmentDecompilerThread::insertGlobalFunctions(std::stringstream &OS)