sync with trunk

libsdl-org · Jun 6, 2008 · 68f032f · 68f032f
1 parent 91b0eab
commit 68f032f
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 9 deletions.
diff --git a/src/video/SDL_sysvideo.h b/src/video/SDL_sysvideo.h
@@ -127,7 +127,6 @@ struct SDL_Window
 
     int display;
     SDL_Renderer *renderer;
-    SDL_GLContext context;
 
     void *userdata;
     void *driverdata;

diff --git a/src/video/SDL_video.c b/src/video/SDL_video.c
@@ -2525,12 +2525,6 @@ SDL_GL_MakeCurrent(SDL_WindowID windowID, SDL_GLContext context)
     if (!context) {
         window = NULL;
     }
-    if (window) {
-        if (window->context == context) {
-            return 0;
-        }
-        window->context = context;
-    }
     return _this->GL_MakeCurrent(_this, window, context);
 }
 

diff --git a/src/video/cocoa/SDL_cocoaopengl.m b/src/video/cocoa/SDL_cocoaopengl.m
@@ -288,7 +288,7 @@ - (CGLContextObj)CGLContextObj;
 {
     NSAutoreleasePool *pool;
     NSOpenGLContext *nscontext;
-    long value;
+    GLint value;
     int status;
 
     pool = [[NSAutoreleasePool alloc] init];
@@ -312,7 +312,7 @@ - (CGLContextObj)CGLContextObj;
 {
     NSAutoreleasePool *pool;
     NSOpenGLContext *nscontext;
-    long value;
+    GLint value;
     int status;
 
     pool = [[NSAutoreleasePool alloc] init];