Mercurial > sdl-ios-xcode
changeset 1120:8e1fde455471
Patch by me to fix crash described below.
--ryan.
To: sdl@libsdl.org
From: Rainer Deyke <rainerd@eldwood.com>
Date: Tue, 16 Aug 2005 01:08:18 -0600
Subject: [SDL] Bug report: SDL_CreateRGBSurface with SDL_HWSURFACE crashes
If SDL is in full-screen mode with a hardware video surface on OS X,
SDL_CreateRGBSurface with SDL_HWSURFACE crashes. The crash occurs on
line 109 of SDL_Surface.c. This was tested on OS X 10.3.9 with both SDL
1.2.8 and the latest CVS. Here is a small C++ program that demonstrates
the problem:
#include "SDL.h"
#include <stdio.h>
namespace {
void wait_for_key()
{
SDL_Event e;
printf("%d\n", SDL_GetAppState());
while (SDL_WaitEvent(&e)) {
if (e.type == SDL_KEYDOWN || e.type == SDL_QUIT) return;
}
}
}
int main(int, char *[])
{
SDL_Init(SDL_INIT_VIDEO);
SDL_Surface *screen
= SDL_SetVideoMode(640, 480, 32, SDL_FULLSCREEN | SDL_HWSURFACE);
SDL_Surface *s = SDL_CreateRGBSurface(SDL_HWSURFACE, 640, 480, 32,
screen->format->Rmask, screen->format->Gmask,
screen->format->Bmask, screen->format->Amask);
wait_for_key();
if (s) SDL_FreeSurface(s);
SDL_Quit();
printf("Success!\n");
return 0;
}
| author | Ryan C. Gordon <icculus@icculus.org> |
|---|---|
| date | Thu, 18 Aug 2005 06:46:32 +0000 |
| parents | 430d8d701f69 |
| children | 7c3aa6e87a05 |
| files | src/video/quartz/SDL_QuartzVideo.m |
| diffstat | 1 files changed, 6 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/video/quartz/SDL_QuartzVideo.m Thu Aug 18 06:18:30 2005 +0000 +++ b/src/video/quartz/SDL_QuartzVideo.m Thu Aug 18 06:46:32 2005 +0000 @@ -95,6 +95,7 @@ #endif static int QZ_LockHWSurface(_THIS, SDL_Surface *surface); static void QZ_UnlockHWSurface(_THIS, SDL_Surface *surface); +static int QZ_AllocHWSurface(_THIS, SDL_Surface *surface); static void QZ_FreeHWSurface (_THIS, SDL_Surface *surface); /* static int QZ_FlipHWSurface (_THIS, SDL_Surface *surface); */ @@ -137,6 +138,7 @@ device->LockHWSurface = QZ_LockHWSurface; device->UnlockHWSurface = QZ_UnlockHWSurface; + device->AllocHWSurface = QZ_AllocHWSurface; device->FreeHWSurface = QZ_FreeHWSurface; /* device->FlipHWSurface = QZ_FlipHWSurface */; @@ -1506,6 +1508,10 @@ } +static int QZ_AllocHWSurface(_THIS, SDL_Surface *surface) { + return(-1); /* unallowed (no HWSURFACE support here). */ +} + static void QZ_FreeHWSurface (_THIS, SDL_Surface *surface) { }