archive/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-09-20 03:11:51 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #10989 from CasualPokePlayer/fifo_reset_dual_core

Browse source 
Fix crashes in dual core mode on a PI_FIFO_RESET
This commit is contained in:
JMC47 2022-08-18 17:32:29 -04:00 committed by GitHub
commit 498c06b85a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Source/Core/Core/HW/ProcessorInterface.cpp
View file

@ -18,6 +18,7 @@
#include "Core/IOS/IOS.h"
#include "Core/IOS/STM/STM.h"
#include "Core/PowerPC/PowerPC.h"
#include "VideoCommon/AsyncRequests.h"
#include "VideoCommon/Fifo.h"
namespace ProcessorInterface
@ -108,7 +109,19 @@ void RegisterMMIO(MMIO::Mapping* mmio, u32 base)
if ((val & 1) != 0)
{
GPFifo::ResetGatherPipe();
Fifo::ResetVideoBuffer();
// Call Fifo::ResetVideoBuffer() from the video thread. Since that function
// resets various pointers used by the video thread, we can't call it directly
// from the CPU thread, so queue a task to do it instead. In single-core mode,
// AsyncRequests is in passthrough mode, so this will be safely and immediately
// called on the CPU thread.
// NOTE: GPFifo::ResetGatherPipe() only affects
// CPU state, so we can call it directly
AsyncRequests::Event ev = {};
ev.type = AsyncRequests::Event::FIFO_RESET;
AsyncRequests::GetInstance()->PushEvent(ev);
}
}));

4
Source/Core/VideoCommon/AsyncRequests.cpp
View file

@ -158,6 +158,10 @@ void AsyncRequests::HandleEvent(const AsyncRequests::Event& e)
*e.bbox.data = g_renderer->BBoxRead(e.bbox.index);
break;
case Event::FIFO_RESET:
Fifo::ResetVideoBuffer();
break;
case Event::PERF_QUERY:
g_perf_query->FlushResults();
break;

5
Source/Core/VideoCommon/AsyncRequests.h
View file

@ -27,6 +27,7 @@ public:
EFB_PEEK_Z,
SWAP_EVENT,
BBOX_READ,
FIFO_RESET,
PERF_QUERY,
DO_SAVE_STATE,
} type;
@ -62,6 +63,10 @@ public:
u16* data;
} bbox;
struct
{
} fifo_reset;
struct
{
} perf_query;