mirror of https://github.com/PCSX2/pcsx2.git
GSdx: Remove a hack I put in when I introduced GSopen2 -- it's obsolete since adding Device deletion to GSclose (and was causing some bugs on the F9 render switcher).
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2130 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
parent
3b4550cdc8
commit
93798be614
|
@ -144,31 +144,6 @@ static INT32 _GSopen(void* dsp, char* title, int renderer)
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
GSFreezeData tempsave = { 0, NULL };
|
|
||||||
|
|
||||||
if(s_gs && (s_renderer != renderer))
|
|
||||||
{
|
|
||||||
// This isn't a "normal" suspend resume case -- We need to swap renderers, but
|
|
||||||
// we have to preserve the GSState at the same time, so quick-save it to the
|
|
||||||
// tempsave, and then recover below after the new GSRenderer is in place.
|
|
||||||
|
|
||||||
s_gs->Freeze(&tempsave, true);
|
|
||||||
|
|
||||||
tempsave.data = (uint8*)_aligned_malloc( tempsave.size, 16 );
|
|
||||||
|
|
||||||
if(!tempsave.data)
|
|
||||||
{
|
|
||||||
throw std::bad_alloc("Failed allocating buffer for device-change savestate.");
|
|
||||||
}
|
|
||||||
|
|
||||||
s_gs->Freeze( &tempsave, false );
|
|
||||||
|
|
||||||
delete s_gs;
|
|
||||||
|
|
||||||
s_gs = NULL;
|
|
||||||
s_renderer = -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
switch(renderer)
|
switch(renderer)
|
||||||
{
|
{
|
||||||
default:
|
default:
|
||||||
|
@ -203,12 +178,6 @@ static INT32 _GSopen(void* dsp, char* title, int renderer)
|
||||||
|
|
||||||
s_renderer = renderer;
|
s_renderer = renderer;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(tempsave.data)
|
|
||||||
{
|
|
||||||
s_gs->Defrost(&tempsave);
|
|
||||||
_aligned_free(tempsave.data);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
catch( std::exception& ex )
|
catch( std::exception& ex )
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue