pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Mac OS X: Try to resize--without destroying--the GL context in SetVideoMode.

Browse source 
--HG--
branch : SDL-1.2
This commit is contained in:
Ryan C. Gordon 2011-11-04 00:58:24 -04:00
parent a9bf84e11f
commit 3550f582ad
1 changed files with 31 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/video/quartz/SDL_QuartzVideo.m
View file

@ -1113,6 +1113,37 @@ static SDL_Surface* QZ_SetVideoMode (_THIS, SDL_Surface *current, int width,
int height, int bpp, Uint32 flags)
{
const BOOL isLion = IS_LION_OR_LATER(this);
/* Don't throw away the GL context if we can just resize the current one. */
if ( (video_set == SDL_TRUE) && ((flags & (SDL_OPENGL | SDL_FULLSCREEN)) == (current->flags & (SDL_OPENGL | SDL_FULLSCREEN))) && (bpp == current->format->BitsPerPixel) ) {
const NSRect contentRect = NSMakeRect (0, 0, width, height);
if (flags & SDL_FULLSCREEN) {
/* if these fail, we'll try the old way, of tearing everything down. */
const void *newmode = QZ_BestMode(this, bpp, width, height);
if ( newmode != NULL ) {
if ( QZ_SetDisplayMode(this, newmode) != CGDisplayNoErr ) {
QZ_ReleaseDisplayMode(this, newmode);
} else {
QZ_ReleaseDisplayMode(this, mode); /* NULL is okay. */
mode = newmode;
current->w = width;
current->h = height;
[ qz_window setContentSize:contentRect.size ];
[ window_view setFrameSize:contentRect.size ];
[ gl_context update ];
return current;
}
}
} else {
current->w = width;
current->h = height;
[ qz_window setContentSize:contentRect.size ];
[ window_view setFrameSize:contentRect.size ];
[ gl_context update ];
return current;
}
}
current->flags = 0;
current->pixels = NULL;