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

rsx: Bug fixes and improvements

Browse Source 
rsx: Try to skip unknown commands without discarding entire cb
This commit is contained in:
kd-11 2017-09-06 00:59:03 +03:00
parent 9359b8c170
commit abb56a354d
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
rpcs3/Emu/RSX/RSXThread.cpp
View File

@ -457,12 +457,14 @@ namespace rsx
auto args = vm::ptr<u32>::make(args_address);
invalid_command_interrupt_raised = false;
bool unaligned_command = false;
u32 first_cmd = (cmd & 0xfffc) >> 2;
if (cmd & 0x3)
{
LOG_WARNING(RSX, "unaligned command: %s (0x%x from 0x%x)", get_method_name(first_cmd).c_str(), first_cmd, cmd & 0xffff);
unaligned_command = true;
}
for (u32 i = 0; i < count; i++)
@ -471,7 +473,6 @@ namespace rsx
u32 value = args[i];
//LOG_NOTICE(RSX, "%s(0x%x) = 0x%x", get_method_name(reg).c_str(), reg, value);
method_registers.decode(reg, value);
if (capture_current_frame)
@ -486,14 +487,18 @@ namespace rsx
if (invalid_command_interrupt_raised)
{
//Ignore processing the rest of the chain
ctrl->get = put;
//Skip the rest of this command
break;
}
}
if (invalid_command_interrupt_raised)
if (unaligned_command && invalid_command_interrupt_raised)
{
//This is almost guaranteed to be heap corruption at this point
//Ignore the rest of the chain
ctrl->get = put;
continue;
}
ctrl->get = get + (count + 1) * 4;
}

3
rpcs3/Emu/RSX/VK/VKTextureCache.h
View File

@ -378,6 +378,9 @@ namespace vk
auto &range_data = address_range.second;
for (auto &tex : range_data.data)
{
if (tex.get_section_base() > rsx_address)
continue;
if (!tex.is_dirty() && tex.overlaps(test, true))
return &tex;
}