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

rsx: Re-enable fifo error reset

Browse source
This commit is contained in:
kd-11 2018-11-12 16:15:28 +03:00 • committed by kd-11
parent 718a04c84f
commit 1d19f71a46
3 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
rpcs3/Emu/RSX/RSXFIFO.cpp
View file

@ -371,8 +371,8 @@ namespace rsx
case FIFO::FIFO_ERROR: case FIFO::FIFO_ERROR:
{ {
// Error. Should reset the queue // Error. Should reset the queue
// TODO
LOG_ERROR(RSX, "FIFO error: possible desync event"); LOG_ERROR(RSX, "FIFO error: possible desync event");
fifo_ctrl->set_get(restore_point);
std::this_thread::sleep_for(1ms); std::this_thread::sleep_for(1ms);
return; return;
} }

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

@ -653,6 +653,13 @@ namespace rsx
continue; continue;
} }
// Note a possible rollback address
if (sync_point_request)
{
restore_point = ctrl->get;
sync_point_request = false;
}
// Execute backend-local tasks first // Execute backend-local tasks first
do_local_task(performance_counters.state); do_local_task(performance_counters.state);

2
rpcs3/Emu/RSX/RSXThread.h
View file

@ -403,7 +403,7 @@ namespace rsx
public: public:
RsxDmaControl* ctrl = nullptr; RsxDmaControl* ctrl = nullptr;
atomic_t<u32> restore_point{ 0 }; u32 restore_point = 0;
atomic_t<bool> external_interrupt_lock{ false }; atomic_t<bool> external_interrupt_lock{ false };
atomic_t<bool> external_interrupt_ack{ false }; atomic_t<bool> external_interrupt_ack{ false };