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

gs: introspect gs state directly

This commit is contained in:
Gauvain 'GovanifY' Roussel-Tarbouriech 2021-05-14 11:23:30 +02:00 committed by Kojin
parent fa9b30fa9e
commit 70dde551e3
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pcsx2/GS/GS.h
View File

@ -1965,3 +1965,5 @@ struct GSErrorGlVertexArrayTooSmall : GSError
};
extern GSApp theApp;
extern bool gsopen_done;

2
pcsx2/gui/AppMain.cpp
View File

@ -868,7 +868,7 @@ void Pcsx2App::OpenGsPanel()
gsFrame->SetSize( oldsize );
}
//TODO: MAKE SURE GS IS CLOSED HERE
pxAssertDev( !gsopen_done, "GS Plugin must be closed prior to opening a new Gs Panel!" );
#ifdef __WXGTK__
// The x window/display are actually very deeper in the widget. You need both display and window

2
pcsx2/gui/FrameForGS.cpp
View File

@ -688,7 +688,7 @@ void GSFrame::AppStatusEvent_OnSettingsApplied()
if( g_Conf->GSWindow.CloseOnEsc )
{
if (IsShown() /*&& TODO: CHECK IS GS IS CLOSED */)
if (IsShown() && !gsopen_done)
Show( false );
}
}

11
pcsx2/gui/GlobalCommands.cpp
View File

@ -400,12 +400,11 @@ namespace Implementations
return;
if (renderswitch_delay == 0)
{
/* TODO: reimplement this:
* ScopedCoreThreadPause paused_core(new SysExecEvent_SaveSinglePlugin(PluginId_GS));
* renderswitch = !renderswitch;
* paused_core.AllowResume();
* renderswitch_delay = -1;
*/
ScopedCoreThreadPause paused_core();
GSfreeze();
renderswitch = !renderswitch;
paused_core.AllowResume();
renderswitch_delay = -1;
}
}