Mercurial > sdl-ios-xcode
view src/thread/generic/SDL_sysmutex.c @ 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 | b8d311d90021 |
children | c9b51268668f |
line wrap: on
line source
/* SDL - Simple DirectMedia Layer Copyright (C) 1997-2004 Sam Lantinga This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Sam Lantinga slouken@libsdl.org */ #ifdef SAVE_RCSID static char rcsid = "@(#) $Id$"; #endif /* An implementation of mutexes using semaphores */ #include <stdio.h> #include <stdlib.h> #include "SDL_error.h" #include "SDL_thread.h" #include "SDL_systhread_c.h" struct SDL_mutex { int recursive; Uint32 owner; SDL_sem *sem; }; /* Create a mutex */ SDL_mutex *SDL_CreateMutex(void) { SDL_mutex *mutex; /* Allocate mutex memory */ mutex = (SDL_mutex *)malloc(sizeof(*mutex)); if ( mutex ) { /* Create the mutex semaphore, with initial value 1 */ mutex->sem = SDL_CreateSemaphore(1); mutex->recursive = 0; mutex->owner = 0; if ( ! mutex->sem ) { free(mutex); mutex = NULL; } } else { SDL_OutOfMemory(); } return mutex; } /* Free the mutex */ void SDL_DestroyMutex(SDL_mutex *mutex) { if ( mutex ) { if ( mutex->sem ) { SDL_DestroySemaphore(mutex->sem); } free(mutex); } } /* Lock the semaphore */ int SDL_mutexP(SDL_mutex *mutex) { #ifdef DISABLE_THREADS return 0; #else Uint32 this_thread; if ( mutex == NULL ) { SDL_SetError("Passed a NULL mutex"); return -1; } this_thread = SDL_ThreadID(); if ( mutex->owner == this_thread ) { ++mutex->recursive; } else { /* The order of operations is important. We set the locking thread id after we obtain the lock so unlocks from other threads will fail. */ SDL_SemWait(mutex->sem); mutex->owner = this_thread; mutex->recursive = 0; } return 0; #endif /* DISABLE_THREADS */ } /* Unlock the mutex */ int SDL_mutexV(SDL_mutex *mutex) { #ifdef DISABLE_THREADS return 0; #else if ( mutex == NULL ) { SDL_SetError("Passed a NULL mutex"); return -1; } /* If we don't own the mutex, we can't unlock it */ if ( SDL_ThreadID() != mutex->owner ) { SDL_SetError("mutex not owned by this thread"); return -1; } if ( mutex->recursive ) { --mutex->recursive; } else { /* The order of operations is important. First reset the owner so another thread doesn't lock the mutex and set the ownership before we reset it, then release the lock semaphore. */ mutex->owner = 0; SDL_SemPost(mutex->sem); } return 0; #endif /* DISABLE_THREADS */ }