Leahnaya/SDL
1
0
Fork 0
mirror of https://github.com/yawut/SDL.git synced 2026-10-02 05:06:46 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed SDL 1.2 fullscreen OpenGL on Mac OS X 10.7.

Browse Source 
I'm not sure if there was a way to make CGLSetFullScreen() work, but the
Cocoa path works fine on all Intel Macs.

Please note that the "official" way to do fullscreen in 10.7 is just to make
a window the size of the display mode, and OS X is now smart enough to
recognize this as "fullscreen", but this helps earlier versions of the OS in
any case.

--HG--
branch : SDL-1.2
This commit is contained in:
Ryan C. Gordon
2011-08-10 01:25:00 -04:00
parent 30d7f06bfa
commit 1da88c2ee0
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/video/quartz/SDL_QuartzVideo.m
View File

@@ -411,7 +411,9 @@ static void QZ_UnsetVideoMode (_THIS, BOOL to_desktop)
if ( mode_flags & SDL_OPENGL ) {
QZ_TearDownOpenGL (this);
#ifdef __powerpc__ /* we only use this for pre-10.3 compatibility. */
CGLSetFullScreen (NULL);
#endif
}
if (to_desktop) {
ShowMenuBar ();
@@ -529,9 +531,6 @@ static SDL_Surface* QZ_SetVideoFullScreen (_THIS, SDL_Surface *current, int widt
CGLError err;
CGLContextObj ctx;
/* CGLSetFullScreen() will handle this for us. */
[ qz_window setLevel:NSNormalWindowLevel ];
if ( ! QZ_SetupOpenGL (this, bpp, flags) ) {
goto ERR_NO_GL;
}
@@ -542,13 +541,22 @@ static SDL_Surface* QZ_SetVideoFullScreen (_THIS, SDL_Surface *current, int widt
[ [ qz_window contentView ] addSubview:window_view ];
[ window_view release ];
#ifdef __powerpc__ /* there's a Cocoa API for this in 10.3 */
/* CGLSetFullScreen() will handle this for us. */
[ qz_window setLevel:NSNormalWindowLevel ];
ctx = QZ_GetCGLContextObj (gl_context);
err = CGLSetFullScreen (ctx);
if (err) {
SDL_SetError ("Error setting OpenGL fullscreen: %s", CGLErrorString(err));
goto ERR_NO_GL;
}
#else
[ qz_window setLevel:CGShieldingWindowLevel() ];
[ gl_context setView:window_view ];
[ gl_context setFullScreen ];
[ gl_context update ];
#endif
[ gl_context makeCurrentContext];