From 5f070bf225f72c818a69313632a09219886f1de4 Mon Sep 17 00:00:00 2001 From: omegadox Date: Sun, 22 Mar 2009 12:05:20 +0000 Subject: [PATCH] Removed TortoiseSVN Junk git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2728 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp index 60a57d208d..37076681ac 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp @@ -699,7 +699,6 @@ void OpenGL_Shutdown() hDC = NULL; // Set DC To NULL } #elif defined(HAVE_X11) && HAVE_X11 -<<<<<<< .mine if (GLWin.ctx) { if (!glXMakeCurrent(GLWin.dpy, None, NULL)) @@ -711,19 +710,6 @@ void OpenGL_Shutdown() XCloseDisplay(GLWin.dpy); 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 /* switch back to original desktop resolution if we were in fs */ if (GLWin.dpy != NULL) {