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

rsx: Fix critical bug concerning transient data layout in memory

Browse source
This commit is contained in:
kd-11 2017-10-25 14:15:28 +03:00
parent d53673c6f7
commit 9c9495621c
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
rpcs3/Emu/RSX/RSXThread.cpp
View file

@ -1571,6 +1571,7 @@ namespace rsx
u32 volatile_offset = 0; u32 volatile_offset = 0;
u32 persistent_offset = 0; u32 persistent_offset = 0;
//NOTE: Order is important! Transient ayout is always push_buffers followed by register data
if (rsx::method_registers.current_draw_clause.is_immediate_draw) if (rsx::method_registers.current_draw_clause.is_immediate_draw)
{ {
for (const auto &info : layout.volatile_blocks) for (const auto &info : layout.volatile_blocks)
@ -1765,12 +1766,7 @@ namespace rsx
return; return;
} }
for (const u8 index : layout.referenced_registers) //NOTE: Order is important! Transient ayout is always push_buffers followed by register data
{
memcpy(transient, rsx::method_registers.register_vertex_info[index].data.data(), 16);
transient += 16;
}
if (draw_call.is_immediate_draw) if (draw_call.is_immediate_draw)
{ {
//NOTE: It is possible for immediate draw to only contain index data, so vertex data can be in persistent memory //NOTE: It is possible for immediate draw to only contain index data, so vertex data can be in persistent memory
@ -1780,6 +1776,12 @@ namespace rsx
transient += info.second; transient += info.second;
} }
} }
for (const u8 index : layout.referenced_registers)
{
memcpy(transient, rsx::method_registers.register_vertex_info[index].data.data(), 16);
transient += 16;
}
} }
if (persistent != nullptr) if (persistent != nullptr)