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

GS: Fix possible crash when changing settings with readbacks disabled

This commit is contained in:
Connor McLaughlin 2022-06-16 20:40:08 +10:00 committed by lightningterror
parent 999b2267c0
commit c86e82039a
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pcsx2/MTGS.cpp
View File

@ -242,7 +242,7 @@ void SysMtgsThread::PostVsyncStart(bool registers_written)
void SysMtgsThread::InitAndReadFIFO(u8* mem, u32 qwc) void SysMtgsThread::InitAndReadFIFO(u8* mem, u32 qwc)
{ {
if (GSConfig.HWDisableReadbacks && GSConfig.UseHardwareRenderer()) if (EmuConfig.GS.HWDisableReadbacks && GSConfig.UseHardwareRenderer())
{ {
GSReadLocalMemoryUnsync(mem, qwc, vif1.BITBLTBUF._u64, vif1.TRXPOS._u64, vif1.TRXREG._u64); GSReadLocalMemoryUnsync(mem, qwc, vif1.BITBLTBUF._u64, vif1.TRXPOS._u64, vif1.TRXREG._u64);
return; return;
@ -916,6 +916,13 @@ void SysMtgsThread::ApplySettings()
RunOnGSThread([opts = EmuConfig.GS]() { RunOnGSThread([opts = EmuConfig.GS]() {
GSUpdateConfig(opts); GSUpdateConfig(opts);
}); });
// We need to synchronize the thread when changing any settings when the download mode
// is unsynchronized, because otherwise we might potentially read in the middle of
// the GS renderer being reopened.
if (EmuConfig.GS.HWDisableReadbacks)
WaitGS(false, false, false);
} }
void SysMtgsThread::ResizeDisplayWindow(int width, int height, float scale) void SysMtgsThread::ResizeDisplayWindow(int width, int height, float scale)
@ -960,6 +967,10 @@ void SysMtgsThread::SwitchRenderer(GSRendererType renderer, bool display_message
RunOnGSThread([renderer]() { RunOnGSThread([renderer]() {
GSSwitchRenderer(renderer); GSSwitchRenderer(renderer);
}); });
// See note in ApplySettings() for reasoning here.
if (EmuConfig.GS.HWDisableReadbacks)
WaitGS(false, false, false);
} }
void SysMtgsThread::SetSoftwareRendering(bool software, bool display_message /* = true */) void SysMtgsThread::SetSoftwareRendering(bool software, bool display_message /* = true */)