Mercurial > sdl-ios-xcode
view src/thread/riscos/SDL_sysmutex.c @ 1164:10b3fb28c86b
Date: Mon, 31 Oct 2005 14:23:34 +0100
From: Thomas Omilian <paccy@arcor.de>
To: sdl@libsdl.org
Subject: [SDL] SDL_SoftStretch() fixed!
Ok, after debugging the night I found the error:
in video/SDL_stretch.c in Line 81
/* See if we need to regenerate the copy buffer */
if ( (src_w == last.src_w) &&
(dst_w == last.src_w) && (bpp == last.bpp) ) {
return(0);
}
the second comparison should be (dst_w == last dst_w).
Perhaps someone could apply it to the source...
Regards,
Thomas Omilian
author | Ryan C. Gordon <icculus@icculus.org> |
---|---|
date | Tue, 01 Nov 2005 04:14:24 +0000 |
parents | d74fbf56f2f6 |
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 */ /* RISC OS implementations uses pthreads based on linux code */ #ifdef SAVE_RCSID static char rcsid = "@(#) $Id$"; #endif #ifdef DISABLE_THREADS #include "../generic/SDL_sysmutex.c" #else #include <stdlib.h> #include <stdio.h> #include <pthread.h> #include "SDL_error.h" #include "SDL_thread.h" struct SDL_mutex { pthread_mutex_t id; #ifdef PTHREAD_NO_RECURSIVE_MUTEX int recursive; pthread_t owner; #endif }; SDL_mutex *SDL_CreateMutex (void) { SDL_mutex *mutex; pthread_mutexattr_t attr; /* Allocate the structure */ mutex = (SDL_mutex *)calloc(1, sizeof(*mutex)); if ( mutex ) { pthread_mutexattr_init(&attr); #ifdef PTHREAD_NO_RECURSIVE_MUTEX /* No extra attributes necessary */ #else pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE); #endif /* PTHREAD_NO_RECURSIVE_MUTEX */ if ( pthread_mutex_init(&mutex->id, &attr) != 0 ) { SDL_SetError("pthread_mutex_init() failed"); free(mutex); mutex = NULL; } } else { SDL_OutOfMemory(); } return(mutex); } void SDL_DestroyMutex(SDL_mutex *mutex) { if ( mutex ) { pthread_mutex_destroy(&mutex->id); free(mutex); } } /* Lock the mutex */ int SDL_mutexP(SDL_mutex *mutex) { int retval; #ifdef PTHREAD_NO_RECURSIVE_MUTEX pthread_t this_thread; #endif if ( mutex == NULL ) { SDL_SetError("Passed a NULL mutex"); return -1; } retval = 0; #ifdef PTHREAD_NO_RECURSIVE_MUTEX this_thread = pthread_self(); 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. */ if ( pthread_mutex_lock(&mutex->id) == 0 ) { mutex->owner = this_thread; mutex->recursive = 0; } else { SDL_SetError("pthread_mutex_lock() failed"); retval = -1; } } #else if ( pthread_mutex_lock(&mutex->id) < 0 ) { SDL_SetError("pthread_mutex_lock() failed"); retval = -1; } #endif return retval; } int SDL_mutexV(SDL_mutex *mutex) { int retval; if ( mutex == NULL ) { SDL_SetError("Passed a NULL mutex"); return -1; } retval = 0; #ifdef PTHREAD_NO_RECURSIVE_MUTEX /* We can only unlock the mutex if we own it */ if ( pthread_self() == mutex->owner ) { 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; pthread_mutex_unlock(&mutex->id); } } else { SDL_SetError("mutex not owned by this thread"); retval = -1; } #else if ( pthread_mutex_unlock(&mutex->id) < 0 ) { SDL_SetError("pthread_mutex_unlock() failed"); retval = -1; } #endif /* PTHREAD_NO_RECURSIVE_MUTEX */ return retval; } #endif