ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GS: Use ResetGS() for CSR resets

This commit is contained in:
Stenzek 2023-06-24 17:49:30 +10:00 committed by Connor McLaughlin
parent 55e73bb4b9
commit 0dc39a66d7
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pcsx2/GS.cpp
View File

@ -86,7 +86,7 @@ static __fi void gsCSRwrite( const tGS_CSR& csr )
std::memset(g_RealGSMem, 0, sizeof(g_RealGSMem));
GSIMR.reset();
CSRreg.Reset();
MTGS::SendSimplePacket(MTGS::Command::Reset, 0, 0, 0);
MTGS::ResetGS(false);
}
if(csr.FLUSH)

16
pcsx2/MTGS.cpp
View File

@ -69,6 +69,7 @@ namespace MTGS
static void PrepDataPacket(GIF_PATH pathidx, u32 size);
static void SendDataPacket();
static void SendSimplePacket(Command type, int data0, int data1, int data2);
static void SendSimpleGSPacket(Command type, u32 offset, u32 size, GIF_PATH path);
static void SendPointerPacket(Command type, u32 data0, void* data1);
static void _FinishSimplePacket();
@ -206,20 +207,23 @@ void MTGS::ThreadEntryPoint()
void MTGS::ResetGS(bool hardware_reset)
{
pxAssertDev(!IsOpen() || (s_ReadPos == s_WritePos), "Must close or terminate the GS thread prior to gsReset.");
// MTGS Reset process:
// * clear the ringbuffer.
// * Signal a reset.
// * clear the path and byRegs structs (used by GIFtagDummy)
s_ReadPos = s_WritePos.load();
s_QueuedFrameCount = 0;
s_VsyncSignalListener = 0;
if (hardware_reset)
{
s_ReadPos = s_WritePos.load();
s_QueuedFrameCount = 0;
s_VsyncSignalListener = 0;
}
MTGS_LOG("MTGS: Sending Reset...");
SendSimplePacket(Command::Reset, static_cast<int>(hardware_reset), 0, 0);
SetEvent();
if (hardware_reset)
SetEvent();
}
struct RingCmdPacket_Vsync

2
pcsx2/MTGS.h
View File

@ -74,8 +74,6 @@ namespace MTGS
void WaitForClose();
void Freeze(FreezeAction mode, FreezeData& data);
void SendSimplePacket(Command type, int data0, int data1, int data2);
void PostVsyncStart(bool registers_written);
void InitAndReadFIFO(u8* mem, u32 qwc);