[Bf-blender-cvs] [028fca8] soc-2014-viewport_context: some cleanup of SDL context

[Jason Wilkins]

Commit: 028fca8ba3df6a6df856e34df7c2cebf5fce6794
Author: Jason Wilkins
Date:   Sat Jul 26 02:43:35 2014 -0500
Branches: soc-2014-viewport_context
https://developer.blender.org/rB028fca8ba3df6a6df856e34df7c2cebf5fce6794

some cleanup of SDL context

===================================================================

M       intern/ghost/intern/GHOST_ContextSDL.cpp
M       intern/ghost/intern/GHOST_ContextSDL.h
M       intern/ghost/intern/GHOST_WindowSDL.cpp
M       intern/ghost/intern/GHOST_WindowSDL.h

===================================================================

diff --git a/intern/ghost/intern/GHOST_ContextSDL.cpp 
b/intern/ghost/intern/GHOST_ContextSDL.cpp
index 02befe5..d80a638 100644
--- a/intern/ghost/intern/GHOST_ContextSDL.cpp
+++ b/intern/ghost/intern/GHOST_ContextSDL.cpp
@@ -40,9 +40,6 @@
 #include <cstring>
 
 
-GLEWContext *glewContext = NULL;
-
-
 SDL_GLContext GHOST_ContextSDL::s_sharedContext = NULL;
 int           GHOST_ContextSDL::s_sharedCount   = 0;
 
diff --git a/intern/ghost/intern/GHOST_ContextSDL.h 
b/intern/ghost/intern/GHOST_ContextSDL.h
index abd3dad..5edf1a0 100644
--- a/intern/ghost/intern/GHOST_ContextSDL.h
+++ b/intern/ghost/intern/GHOST_ContextSDL.h
@@ -38,9 +38,6 @@ extern "C" {
        #include "SDL.h"
 }
 
-//#define glewGetContext() glewGetContext
-#include "glew-mx.h"
-extern "C" GLEWContext *glewContext;
 
 #ifndef GHOST_OPENGL_SDL_CONTEXT_FLAGS
 #define GHOST_OPENGL_SDL_CONTEXT_FLAGS 0
diff --git a/intern/ghost/intern/GHOST_WindowSDL.cpp 
b/intern/ghost/intern/GHOST_WindowSDL.cpp
index 3128966..1335c38 100644
--- a/intern/ghost/intern/GHOST_WindowSDL.cpp
+++ b/intern/ghost/intern/GHOST_WindowSDL.cpp
@@ -94,8 +94,8 @@ GHOST_WindowSDL::newDrawingContext(GHOST_TDrawingContextType 
type)
                        m_sdl_win,
                        0, // profile bit
                        0, 0,
-                       GHOST_OPENGL_GLX_CONTEXT_FLAGS,
-                       GHOST_OPENGL_GLX_RESET_NOTIFICATION_STRATEGY);
+                       GHOST_OPENGL_SDL_CONTEXT_FLAGS,
+                       GHOST_OPENGL_SDL_RESET_NOTIFICATION_STRATEGY);
 
                if (context->initializeDrawingContext())
                        return context;
diff --git a/intern/ghost/intern/GHOST_WindowSDL.h 
b/intern/ghost/intern/GHOST_WindowSDL.h
index 481ee30..d446c22 100644
--- a/intern/ghost/intern/GHOST_WindowSDL.h
+++ b/intern/ghost/intern/GHOST_WindowSDL.h
@@ -30,7 +30,7 @@
 
 #include "GHOST_Window.h"
 #include "GHOST_SystemSDL.h"
-#include "GHOST_ContextGLX.h"
+
 #include <map>
 
 extern "C" {

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs