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

PCSX2: Avoid hang when switching renders with hotkey. (#3072)

This commit is contained in:
KrossX 2019-08-19 10:44:34 -03:00 committed by Robert Neumann
parent 33571dda42
commit 9788f6db2c
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pcsx2/gui/AppMain.cpp
View File

@ -519,7 +519,7 @@ extern uint eecount_on_last_vdec;
extern bool FMVstarted; extern bool FMVstarted;
extern bool EnableFMV; extern bool EnableFMV;
extern bool renderswitch; extern bool renderswitch;
extern uint do_renderswitch; extern uint renderswitch_delay;
void DoFmvSwitch(bool on) void DoFmvSwitch(bool on)
{ {
@ -535,8 +535,11 @@ void DoFmvSwitch(bool on)
viewport->DoResize(); viewport->DoResize();
} }
if (EmuConfig.Gamefixes.FMVinSoftwareHack) if (EmuConfig.Gamefixes.FMVinSoftwareHack) {
do_renderswitch = -1; ScopedCoreThreadPause paused_core(new SysExecEvent_SaveSinglePlugin(PluginId_GS));
renderswitch = !renderswitch;
paused_core.AllowResume();
}
} }
void Pcsx2App::LogicalVsync() void Pcsx2App::LogicalVsync()
@ -566,13 +569,7 @@ void Pcsx2App::LogicalVsync()
} }
} }
if (do_renderswitch == -1) { renderswitch_delay >>= 1;
ScopedCoreThreadPause paused_core(new SysExecEvent_SaveSinglePlugin(PluginId_GS));
renderswitch = !renderswitch;
paused_core.AllowResume();
}
do_renderswitch >>= 1;
// Only call PADupdate here if we're using GSopen2. Legacy GSopen plugins have the // Only call PADupdate here if we're using GSopen2. Legacy GSopen plugins have the
// GS window belonging to the MTGS thread. // GS window belonging to the MTGS thread.

11
pcsx2/gui/GlobalCommands.cpp
View File

@ -35,7 +35,7 @@
// renderswitch - tells GSdx to go into dx9 sw if "renderswitch" is set. // renderswitch - tells GSdx to go into dx9 sw if "renderswitch" is set.
bool renderswitch = false; bool renderswitch = false;
uint do_renderswitch = 0; uint renderswitch_delay = 0;
extern bool switchAR; extern bool switchAR;
@ -362,8 +362,13 @@ namespace Implementations
void Sys_RenderToggle() void Sys_RenderToggle()
{ {
if (do_renderswitch == 0) if(renderswitch_delay == 0)
do_renderswitch = -1; {
ScopedCoreThreadPause paused_core( new SysExecEvent_SaveSinglePlugin(PluginId_GS) );
renderswitch = !renderswitch;
paused_core.AllowResume();
renderswitch_delay = -1;
}
} }
void Sys_LoggingToggle() void Sys_LoggingToggle()