[Bf-blender-cvs] [cf62424e47] blender2.8: Gawain: remove PER_THREAD macro

Mike Erwin noreply at git.blender.org
Fri Mar 17 19:17:56 CET 2017


Commit: cf62424e47c2b9f266128ad63a796b749d18f7e2
Author: Mike Erwin
Date:   Fri Mar 17 13:50:33 2017 -0400
Branches: blender2.8
https://developer.blender.org/rBcf62424e47c2b9f266128ad63a796b749d18f7e2

Gawain: remove PER_THREAD macro

This attempt at TLS was leftover from an earlier prototype. It never worked with Blender's build system, and was defined to just exist, not to actually do anything.

===================================================================

M	intern/gawain/gawain/common.h
M	intern/gawain/src/immediate.c

===================================================================

diff --git a/intern/gawain/gawain/common.h b/intern/gawain/gawain/common.h
index a4c1e6cba6..b734da4168 100644
--- a/intern/gawain/gawain/common.h
+++ b/intern/gawain/gawain/common.h
@@ -22,10 +22,6 @@
   #include <assert.h>
 #endif
 
-#define PER_THREAD
-// #define PER_THREAD __thread
-// MSVC uses __declspec(thread) for C code
-
 #define APPLE_LEGACY (defined(__APPLE__) && defined(WITH_GL_PROFILE_COMPAT))
 
 #if APPLE_LEGACY
diff --git a/intern/gawain/src/immediate.c b/intern/gawain/src/immediate.c
index dc7c1732a0..0e6a6ba51a 100644
--- a/intern/gawain/src/immediate.c
+++ b/intern/gawain/src/immediate.c
@@ -51,8 +51,8 @@ typedef struct {
 // size of internal buffer -- make this adjustable?
 #define IMM_BUFFER_SIZE (4 * 1024 * 1024)
 
-static PER_THREAD bool initialized = false;
-static PER_THREAD Immediate imm;
+static bool initialized = false;
+static Immediate imm;
 
 void immInit(void)
 	{




More information about the Bf-blender-cvs mailing list