Release thread local storage on thread exit.

src/Common/Thread.hpp

@@ -65,7 +65,7 @@ namespace sw
 			typedef pthread_key_t LocalStorageKey;
 		#endif
 
-		static LocalStorageKey allocateLocalStorageKey();
+		static LocalStorageKey allocateLocalStorageKey(void (*destructor)(void *storage) = free);
 		static void freeLocalStorageKey(LocalStorageKey key);
 		static void *allocateLocalStorage(LocalStorageKey key, size_t size);
 		static void *getLocalStorage(LocalStorageKey key);
@@ -145,13 +145,13 @@ namespace sw
 		#endif
 	}
 
-	inline Thread::LocalStorageKey Thread::allocateLocalStorageKey()
+	inline Thread::LocalStorageKey Thread::allocateLocalStorageKey(void (*destructor)(void *storage))
 	{
 		#if defined(_WIN32)
 			return TlsAlloc();
 		#else
 			LocalStorageKey key;
-			pthread_key_create(&key, free);
+			pthread_key_create(&key, destructor);
 			return key;
 		#endif
 	}

src/OpenGL/libEGL/main.cpp

@@ -39,13 +39,41 @@ static sw::Thread::LocalStorageKey currentTLS = TLS_OUT_OF_INDEXES;
 
 namespace egl
 {
+void releaseCurrent(void *storage)
+{
+	// This pthread destructor is called after the TLS is already reset to NULL,
+	// so we can't call EGL functions here to do the cleanup.
+
+	Current *current = (Current*)storage;
+
+	if(current)
+	{
+		if(current->drawSurface)
+		{
+			current->drawSurface->release();
+		}
+
+		if(current->readSurface)
+		{
+			current->readSurface->release();
+		}
+
+		if(current->context)
+		{
+			current->context->release();
+		}
+
+		free(current);
+	}
+}
+
 Current *attachThread()
 {
 	TRACE("()");
 
 	if(currentTLS == TLS_OUT_OF_INDEXES)
 	{
-		currentTLS = sw::Thread::allocateLocalStorageKey();
+		currentTLS = sw::Thread::allocateLocalStorageKey(releaseCurrent);
 	}
 
 	Current *current = (Current*)sw::Thread::allocateLocalStorage(currentTLS, sizeof(Current));