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 Packages Projects Releases Wiki Activity

vk: Fix use of push constants

Browse source 
- The double-overhead is so not worth it. Better to remove it down the line.
This commit is contained in:
kd-11 2025-07-27 03:27:57 +03:00 committed by kd-11
parent 5911330f8b
commit 33e4b11509
2 changed files with 23 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -286,7 +286,7 @@ void VKFragmentDecompilerThread::insertConstants(std::stringstream & OS)
OS << OS <<
"layout(push_constant) uniform push_constants_block\n" "layout(push_constant) uniform push_constants_block\n"
"{\n" "{\n"
" uint fs_constants_offset;\n" " layout(offset=12) uint fs_constants_offset;\n"
"};\n\n"; "};\n\n";
const vk::glsl::program_input push_constants const vk::glsl::program_input push_constants

30
rpcs3/Emu/RSX/VK/VKGSRender.cpp
View file

@ -2185,11 +2185,15 @@ void VKGSRender::upload_transform_constants(const rsx::io_buffer& buffer)
void VKGSRender::update_vertex_env(u32 id, const vk::vertex_upload_info& vertex_info) void VKGSRender::update_vertex_env(u32 id, const vk::vertex_upload_info& vertex_info)
{ {
struct rsx_prog_push_constants_block_t struct rsx_vs_prog_push_constants_block_t
{ {
u32 xform_constants_offset; u32 xform_constants_offset;
u32 vs_context_offset; u32 vs_context_offset;
u32 vs_attrib_layout_offset; u32 vs_attrib_layout_offset;
};
struct rsx_fs_prog_push_constants_block_t
{
u32 fs_constants_offset; u32 fs_constants_offset;
}; };
@ -2209,19 +2213,29 @@ void VKGSRender::update_vertex_env(u32 id, const vk::vertex_upload_info& vertex_
const u32 fs_constant_id_offset = static_cast<u32>(m_fragment_constants_dynamic_offset) / 16u; const u32 fs_constant_id_offset = static_cast<u32>(m_fragment_constants_dynamic_offset) / 16u;
// Pack // Pack
rsx_prog_push_constants_block_t push_constants; rsx_vs_prog_push_constants_block_t vs_push_constants;
push_constants.xform_constants_offset = vs_constant_id_offset; vs_push_constants.xform_constants_offset = vs_constant_id_offset;
push_constants.vs_context_offset = vertex_context_offset; vs_push_constants.vs_context_offset = vertex_context_offset;
push_constants.vs_attrib_layout_offset = vertex_layout_offset + id; vs_push_constants.vs_attrib_layout_offset = vertex_layout_offset + id;
push_constants.fs_constants_offset = fs_constant_id_offset;
rsx_fs_prog_push_constants_block_t fs_push_constants;
fs_push_constants.fs_constants_offset = fs_constant_id_offset;
vkCmdPushConstants( vkCmdPushConstants(
*m_current_command_buffer, *m_current_command_buffer,
m_program->layout(), m_program->layout(),
VK_SHADER_STAGE_VERTEX_BIT, VK_SHADER_STAGE_VERTEX_BIT,
0, 0,
sizeof(push_constants), sizeof(vs_push_constants),
&push_constants); &vs_push_constants);
vkCmdPushConstants(
*m_current_command_buffer,
m_program->layout(),
VK_SHADER_STAGE_FRAGMENT_BIT,
sizeof(vs_push_constants),
sizeof(fs_push_constants),
&fs_push_constants);
// Now actually fill in the data // Now actually fill in the data
auto buf = m_vertex_layout_ring_info.map(m_vertex_layout_dynamic_offset + (144u * id), 144); auto buf = m_vertex_layout_ring_info.map(m_vertex_layout_dynamic_offset + (144u * id), 144);