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

Merge pull request #580 from PCSX2/issue-565-option 

gsdx: always restore the full gs state object (s_gs)
This commit is contained in:
Gregory Hainaut 2015-06-05 17:51:02 +02:00
parent 46b0a790d4 2ea049b5a5
commit 6c8f7a0147
1 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
plugins/GSdx/GS.cpp
View File

@ -62,7 +62,6 @@ extern bool RunLinuxDialog();
static GSRenderer* s_gs = NULL; static GSRenderer* s_gs = NULL;
static void (*s_irq)() = NULL; static void (*s_irq)() = NULL;
static uint8* s_basemem = NULL; static uint8* s_basemem = NULL;
static int s_renderer = -1;
static bool s_framelimit = true; static bool s_framelimit = true;
static bool s_vsync = false; static bool s_vsync = false;
static bool s_exclusive = true; static bool s_exclusive = true;
@ -155,8 +154,6 @@ EXPORT_C GSshutdown()
s_gs = NULL; s_gs = NULL;
s_renderer = -1;
#ifdef _WINDOWS #ifdef _WINDOWS
if(SUCCEEDED(s_hr)) if(SUCCEEDED(s_hr))
@ -214,16 +211,8 @@ static int _GSopen(void** dsp, char* title, int renderer, int threads = -1)
try try
{ {
if(s_renderer != renderer) delete s_gs;
{ s_gs = NULL;
// 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;
}
switch(renderer) switch(renderer)
{ {
@ -281,8 +270,6 @@ static int _GSopen(void** dsp, char* title, int renderer, int threads = -1)
} }
if (s_gs == NULL) if (s_gs == NULL)
return -1; return -1;
s_renderer = renderer;
} }
if (s_gs->m_wnd == NULL) if (s_gs->m_wnd == NULL)