From 77aaf18d2163523cd7e2f67c33fd1fde4e018e0a Mon Sep 17 00:00:00 2001
From: nakeee <nakeee@gmail.com>
Date: Sun, 14 Dec 2008 00:31:47 +0000
Subject: [PATCH] use opengl_makecurrent before save and 2 small sdl/wx changes

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1526 8ced0084-cf51-0410-be5f-012b33b47a6e
---
 Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp | 11 +++--------
 Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h   |  1 +
 Source/Plugins/Plugin_VideoOGL/Src/main.cpp   | 19 +++++++------------
 3 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp
index 9d5bb8555d..73060b1c0d 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp
@@ -34,14 +34,6 @@ struct RECT
 
 #include "GLUtil.h"
 
-#ifndef USE_SDL
-#define USE_SDL 0
-#endif
-#if USE_SDL
-#include <SDL.h>
-#endif
-
-
 // Handles OpenGL and the window
 
 // externals
@@ -514,6 +506,9 @@ bool OpenGL_MakeCurrent()
         MessageBox(NULL,"(5) Can't Activate The GL Rendering Context.","ERROR",MB_OK|MB_ICONEXCLAMATION);
         return false;
     }
+#elif defined(USE_WX) && USE_WX
+    GLWin.glCanvas->SetCurrent(*GLWin.glCtxt);
+    return true;
 #elif defined(HAVE_X11) && HAVE_X11
     Window winDummy;
     unsigned int borderDummy;
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h
index 9f8cdbffde..917cd62e88 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h
+++ b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h
@@ -43,6 +43,7 @@
 #include <GL/glxew.h>
 #elif defined(USE_SDL) && USE_SDL
 #include <GL/glew.h>
+#include <SDL.h>
 #elif defined(HAVE_COCOA) && HAVE_COCOA
 #include <GL/glew.h>
 #include "cocoaGL.h"
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/main.cpp b/Source/Plugins/Plugin_VideoOGL/Src/main.cpp
index 96ba782855..e703a95470 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/main.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/main.cpp
@@ -21,10 +21,6 @@
 #include "OS/Win32.h"
 #endif
 
-#if defined(USE_SDL) && USE_SDL
-#include <SDL.h>
-#endif
-
 #if defined(HAVE_WX) && HAVE_WX
 #include "GUI/ConfigDlg.h"
 #endif
@@ -195,8 +191,6 @@ void DllConfig(HWND _hParent)
 	XFree(modes);
 	frame.ShowModal();
 #endif
-#else
-	//TODO
 #endif
 }
 
@@ -236,17 +230,18 @@ void Video_Initialize(SVideoInitialize* _pVideoInitialize)
 }
 
 void Video_DoState(unsigned char **ptr, int mode) {
-#ifdef _WIN32
+  //#ifdef _WIN32
 //  What is this code doing here?
 //  if (!wglMakeCurrent(hDC,hRC)) {
 //      PanicAlert("Can't Activate The GL Rendering Context for saving");
 //      return;
 //  }
-#elif defined(HAVE_COCOA) && HAVE_COCOA
-    cocoaGLMakeCurrent(GLWin.cocoaCtx,GLWin.cocoaWin);
-#elif defined(HAVE_X11) && HAVE_X11
-    glXMakeCurrent(GLWin.dpy, GLWin.win, GLWin.ctx);
-#endif
+//#elif defined(HAVE_COCOA) && HAVE_COCOA
+//    cocoaGLMakeCurrent(GLWin.cocoaCtx,GLWin.cocoaWin);
+//#elif defined(HAVE_X11) && HAVE_X11
+//    glXMakeCurrent(GLWin.dpy, GLWin.win, GLWin.ctx);
+//#endif 
+    OpenGL_MakeCurrent();
         
     // Clear all caches that touch RAM
     TextureMngr::Invalidate();