Mercurial > sdl-ios-xcode

diff src/video/quartz/SDL_QuartzVideo.m @ 1658:e49147870aac SDL-1.3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
glSDL support
author Sam Lantinga <slouken@libsdl.org>
date Mon, 01 May 2006 06:58:33 +0000
parents 0a53c90a37f9
children 14717b52abc0
line wrap: on
line diff
--- a/src/video/quartz/SDL_QuartzVideo.m	Fri Apr 28 16:55:41 2006 +0000
+++ b/src/video/quartz/SDL_QuartzVideo.m	Mon May 01 06:58:33 2006 +0000
@@ -379,7 +379,7 @@
             Release the OpenGL context
             Do this first to avoid trash on the display before fade
         */
-        if ( mode_flags & SDL_OPENGL ) {
+        if ( mode_flags & SDL_INTERNALOPENGL ) {
         
             QZ_TearDownOpenGL (this);
             CGLSetFullScreen (NULL);
@@ -406,7 +406,7 @@
         window_view = nil;
 
         /* Release the OpenGL context */
-        if ( mode_flags & SDL_OPENGL )
+        if ( mode_flags & SDL_INTERNALOPENGL )
             QZ_TearDownOpenGL (this);
     }
 
@@ -512,7 +512,7 @@
         current->flags |= SDL_HWPALETTE;
 
     /* Setup OpenGL for a fullscreen context */
-    if (flags & SDL_OPENGL) {
+    if (flags & SDL_INTERNALOPENGL) {
 
         CGLError err;
         CGLContextObj ctx;
@@ -535,7 +535,7 @@
 
         [ gl_context flushBuffer ];
 
-        current->flags |= SDL_OPENGL;
+        current->flags |= SDL_INTERNALOPENGL;
     }
 
     /* If we don't hide menu bar, it will get events and interrupt the program */
@@ -609,8 +609,8 @@
             QZ_UnsetVideoMode (this, TRUE);
         }
         else if ( ((mode_flags ^ flags) & (SDL_NOFRAME|SDL_RESIZABLE)) ||
-                  (mode_flags & SDL_OPENGL) || 
-                  (flags & SDL_OPENGL) ) {
+                  (mode_flags & SDL_INTERNALOPENGL) || 
+                  (flags & SDL_INTERNALOPENGL) ) {
             QZ_UnsetVideoMode (this, TRUE);
         }
     }
@@ -708,7 +708,7 @@
     }
 
     /* For OpenGL, we bind the context to a subview */
-    if ( flags & SDL_OPENGL ) {
+    if ( flags & SDL_INTERNALOPENGL ) {
 
         if ( ! QZ_SetupOpenGL (this, *bpp, flags) ) {
             if (fade_token != kCGDisplayFadeReservationInvalidToken) {
@@ -725,7 +725,7 @@
         [ window_view release ];
         [ gl_context makeCurrentContext];
         [ qz_window makeKeyAndOrderFront:nil ];
-        current->flags |= SDL_OPENGL;
+        current->flags |= SDL_INTERNALOPENGL;
     }
     /* For 2D, we set the subview to an NSQuickDrawView */
     else {