encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed bug 2076 - OpenGL doesn't work with --disable-threads 

stepik-777

Thread local storage is used to store current window and current opengl context. OpenGL worked before this changeset: 7596 (45e5c263c096)
This commit is contained in:
Sam Lantinga 2013-09-05 07:15:26 -07:00
parent 2afbd773b8
commit 4b942c5a07
3 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/thread/SDL_systhread.h
View File

@ -26,6 +26,7 @@
#define _SDL_systhread_h #define _SDL_systhread_h
#include "SDL_thread.h" #include "SDL_thread.h"
#include "SDL_thread_c.h"
/* This function creates a thread, passing args to SDL_RunThread(), /* This function creates a thread, passing args to SDL_RunThread(),
saves a system-dependent thread id in thread->id, and returns 0 saves a system-dependent thread id in thread->id, and returns 0

4
src/thread/SDL_thread.c
View File

@ -125,6 +125,7 @@ SDL_Generic_GetTLSData()
SDL_TLSEntry *entry; SDL_TLSEntry *entry;
SDL_TLSData *storage = NULL; SDL_TLSData *storage = NULL;
#if !SDL_THREADS_DISABLED
if (!SDL_generic_TLS_mutex) { if (!SDL_generic_TLS_mutex) {
static SDL_SpinLock tls_lock; static SDL_SpinLock tls_lock;
SDL_AtomicLock(&tls_lock); SDL_AtomicLock(&tls_lock);
@ -139,6 +140,7 @@ SDL_Generic_GetTLSData()
} }
SDL_AtomicUnlock(&tls_lock); SDL_AtomicUnlock(&tls_lock);
} }
#endif /* SDL_THREADS_DISABLED */
SDL_MemoryBarrierAcquire(); SDL_MemoryBarrierAcquire();
SDL_LockMutex(SDL_generic_TLS_mutex); SDL_LockMutex(SDL_generic_TLS_mutex);
@ -148,7 +150,9 @@ SDL_Generic_GetTLSData()
break; break;
} }
} }
#if !SDL_THREADS_DISABLED
SDL_UnlockMutex(SDL_generic_TLS_mutex); SDL_UnlockMutex(SDL_generic_TLS_mutex);
#endif
return storage; return storage;
} }

2
src/thread/SDL_thread_c.h
View File

@ -23,6 +23,8 @@
#ifndef _SDL_thread_c_h #ifndef _SDL_thread_c_h
#define _SDL_thread_c_h #define _SDL_thread_c_h
#include "SDL_thread.h"
/* Need the definitions of SYS_ThreadHandle */ /* Need the definitions of SYS_ThreadHandle */
#if SDL_THREADS_DISABLED #if SDL_THREADS_DISABLED
#include "generic/SDL_systhread_c.h" #include "generic/SDL_systhread_c.h"