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

Removed TortoiseSVN Junk 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2728 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
omegadox 2009-03-22 12:05:20 +00:00
parent fb1ed107cf
commit 5f070bf225
1 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp
View File

@ -699,7 +699,6 @@ void OpenGL_Shutdown()
hDC = NULL; // Set DC To NULL hDC = NULL; // Set DC To NULL
} }
#elif defined(HAVE_X11) && HAVE_X11 #elif defined(HAVE_X11) && HAVE_X11
<<<<<<< .mine
if (GLWin.ctx) if (GLWin.ctx)
{ {
if (!glXMakeCurrent(GLWin.dpy, None, NULL)) if (!glXMakeCurrent(GLWin.dpy, None, NULL))
@ -711,19 +710,6 @@ void OpenGL_Shutdown()
XCloseDisplay(GLWin.dpy); XCloseDisplay(GLWin.dpy);
GLWin.ctx = NULL; GLWin.ctx = NULL;
} }
=======
if (GLWin.ctx)
{
if (!glXMakeCurrent(GLWin.dpy, None, NULL))
{
ERROR_LOG(VIDEO, "Could not release drawing context.");
}
XUnmapWindow(GLWin.dpy, GLWin.win);
glXDestroyContext(GLWin.dpy, GLWin.ctx);
XCloseDisplay(GLWin.dpy);
GLWin.ctx = NULL;
}
>>>>>>> .r2724
#if defined(HAVE_XXF86VM) && HAVE_XXF86VM #if defined(HAVE_XXF86VM) && HAVE_XXF86VM
/* switch back to original desktop resolution if we were in fs */ /* switch back to original desktop resolution if we were in fs */
if (GLWin.dpy != NULL) { if (GLWin.dpy != NULL) {