mirror of
https://github.com/PCSX2/pcsx2.git
synced 2026-11-17 03:24:19 +01:00
Merge pull request #580 from PCSX2/issue-565-option
gsdx: always restore the full gs state object (s_gs)
This commit is contained in:
commit
6c8f7a0147
1 file changed
+2
-15
+2
-15
@@ -62,7 +62,6 @@ extern bool RunLinuxDialog();
|
||||
static GSRenderer* s_gs = NULL;
|
||||
static void (*s_irq)() = NULL;
|
||||
static uint8* s_basemem = NULL;
|
||||
static int s_renderer = -1;
|
||||
static bool s_framelimit = true;
|
||||
static bool s_vsync = false;
|
||||
static bool s_exclusive = true;
|
||||
@@ -155,8 +154,6 @@ EXPORT_C GSshutdown()
|
||||
|
||||
s_gs = NULL;
|
||||
|
||||
s_renderer = -1;
|
||||
|
||||
#ifdef _WINDOWS
|
||||
|
||||
if(SUCCEEDED(s_hr))
|
||||
@@ -214,16 +211,8 @@ static int _GSopen(void** dsp, char* title, int renderer, int threads = -1)
|
||||
|
||||
try
|
||||
{
|
||||
if(s_renderer != renderer)
|
||||
{
|
||||
// Emulator has made a render change request, which requires a completely
|
||||
// new s_gs -- if the emu doesn't save/restore the GS state across this
|
||||
// GSopen call then they'll get corrupted graphics, but that's not my problem.
|
||||
|
||||
delete s_gs;
|
||||
|
||||
s_gs = NULL;
|
||||
}
|
||||
delete s_gs;
|
||||
s_gs = NULL;
|
||||
|
||||
switch(renderer)
|
||||
{
|
||||
@@ -281,8 +270,6 @@ static int _GSopen(void** dsp, char* title, int renderer, int threads = -1)
|
||||
}
|
||||
if (s_gs == NULL)
|
||||
return -1;
|
||||
|
||||
s_renderer = renderer;
|
||||
}
|
||||
|
||||
if (s_gs->m_wnd == NULL)
|
||||
|
||||
Reference in new issue
Block a user