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

Try to clean up GL allocations where needed

This commit is contained in:
Greg Kennedy 2015-12-17 14:37:53 -06:00
parent 281e5eca52
commit 58c0efea4d
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sdl/sdlvideo.cpp
View File

@ -133,9 +133,11 @@ void S9xParseDisplayArg (char **argv, int &i, int argc)
if (!strncasecmp(argv[i], "-opengl", 7)) if (!strncasecmp(argv[i], "-opengl", 7))
{ {
GUI.opengl = TRUE; GUI.opengl = TRUE;
printf ("Using OPENGL backend.\n");
GUI.gl_filter = GL_NEAREST; GUI.gl_filter = GL_NEAREST;
if (!strncasecmp(argv[i], "-opengl_linear", 14)) if (!strncasecmp(argv[i], "-opengl_linear", 14))
{ {
printf ("\tGL_LINEAR filter selected.\n");
GUI.gl_filter = GL_LINEAR; GUI.gl_filter = GL_LINEAR;
} }
} }
@ -149,7 +151,7 @@ void S9xParseDisplayArg (char **argv, int &i, int argc)
if (!strncasecmp(argv[i], "-fullscreen", 11)) if (!strncasecmp(argv[i], "-fullscreen", 11))
{ {
GUI.fullscreen = TRUE; GUI.fullscreen = TRUE;
printf ("Entering fullscreen mode (without scaling).\n"); printf ("Entering fullscreen mode.\n");
} }
else else
if (!strncasecmp(argv[i], "-v", 2)) if (!strncasecmp(argv[i], "-v", 2))
@ -279,6 +281,21 @@ static void TakedownImage (void)
GUI.snes_buffer = NULL; GUI.snes_buffer = NULL;
} }
#ifdef USE_OPENGL
if (GUI.opengl == TRUE)
{
if (GUI.texture) {
glDeleteTextures(1,&GUI.texture);
GUI.texture=0;
}
if (GUI.displaylist)
{
glDeleteLists(GUI.displaylist,1);
GUI.displaylist = 0;
}
}
#endif
S9xGraphicsDeinit(); S9xGraphicsDeinit();
} }
@ -466,7 +483,7 @@ void S9xPutImage (int width, int height)
#ifdef USE_OPENGL #ifdef USE_OPENGL
if (GUI.opengl) if (GUI.opengl)
{ {
// update texture // update GL texture
glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, width, height, GL_RGB, GL_UNSIGNED_SHORT_5_6_5, (uint8 *) GFX.Screen); glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, width, height, GL_RGB, GL_UNSIGNED_SHORT_5_6_5, (uint8 *) GFX.Screen);
} }
#endif #endif