Commit 4b942c5a070aab6ebe3296ca6c9ea511169280bd
2013-09-05T07:15:26
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)
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55
diff --git a/src/thread/SDL_systhread.h b/src/thread/SDL_systhread.h
index 738ea27..36898f3 100644
--- a/src/thread/SDL_systhread.h
+++ b/src/thread/SDL_systhread.h
@@ -26,6 +26,7 @@
#define _SDL_systhread_h
#include "SDL_thread.h"
+#include "SDL_thread_c.h"
/* This function creates a thread, passing args to SDL_RunThread(),
saves a system-dependent thread id in thread->id, and returns 0
diff --git a/src/thread/SDL_thread.c b/src/thread/SDL_thread.c
index 5eaed0c..4b070da 100644
--- a/src/thread/SDL_thread.c
+++ b/src/thread/SDL_thread.c
@@ -125,6 +125,7 @@ SDL_Generic_GetTLSData()
SDL_TLSEntry *entry;
SDL_TLSData *storage = NULL;
+#if !SDL_THREADS_DISABLED
if (!SDL_generic_TLS_mutex) {
static SDL_SpinLock tls_lock;
SDL_AtomicLock(&tls_lock);
@@ -139,6 +140,7 @@ SDL_Generic_GetTLSData()
}
SDL_AtomicUnlock(&tls_lock);
}
+#endif /* SDL_THREADS_DISABLED */
SDL_MemoryBarrierAcquire();
SDL_LockMutex(SDL_generic_TLS_mutex);
@@ -148,7 +150,9 @@ SDL_Generic_GetTLSData()
break;
}
}
+#if !SDL_THREADS_DISABLED
SDL_UnlockMutex(SDL_generic_TLS_mutex);
+#endif
return storage;
}
diff --git a/src/thread/SDL_thread_c.h b/src/thread/SDL_thread_c.h
index 1971ded..c7b063e 100644
--- a/src/thread/SDL_thread_c.h
+++ b/src/thread/SDL_thread_c.h
@@ -23,6 +23,8 @@
#ifndef _SDL_thread_c_h
#define _SDL_thread_c_h
+#include "SDL_thread.h"
+
/* Need the definitions of SYS_ThreadHandle */
#if SDL_THREADS_DISABLED
#include "generic/SDL_systhread_c.h"