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

Quartz: locking should only recheck CGDisplayBaseAddress() for HWSURFACEs.

Browse source 
--HG--
branch : SDL-1.2
This commit is contained in:
Ryan C. Gordon 2011-07-17 01:03:13 -07:00
parent 619e6fbf06
commit fe0bd83030
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1252,7 +1252,7 @@ static int QZ_LockHWSurface(_THIS, SDL_Surface *surface)
* Always get latest bitmap address and rowbytes for the screen surface; * Always get latest bitmap address and rowbytes for the screen surface;
* they can change dynamically (user has multiple monitors, etc). * they can change dynamically (user has multiple monitors, etc).
*/ */
if (surface == SDL_VideoSurface) { if ((surface == SDL_VideoSurface) && (surface->flags & SDL_HWSURFACE)) {
surface->pixels = (void*) CGDisplayBaseAddress (kCGDirectMainDisplay); surface->pixels = (void*) CGDisplayBaseAddress (kCGDirectMainDisplay);
surface->pitch = CGDisplayBytesPerRow (kCGDirectMainDisplay); surface->pitch = CGDisplayBytesPerRow (kCGDirectMainDisplay);
return (surface->pixels != NULL); return (surface->pixels != NULL);