diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-12-01 23:15:05 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-12-01 23:15:05 +0400 |
| commit | 7c0a0bae79bb8f842a575fe83975c6d34d73c64a (patch) | |
| tree | 844857e85903601f60a083d767d6317f3006d31f /intern/cycles/util/util_thread.h | |
| parent | 807fd448a557fbacb70fcd9b5cae76529fdb9b80 (diff) | |
Fix #33375: OSL geom:trianglevertices gave wrong coordinates for static BVH.
Also some simple OSL optimization, passing thread data pointer directly instead
of via thread local storage, and creating ustrings for attribute lookup.
Diffstat (limited to 'intern/cycles/util/util_thread.h')
| -rw-r--r-- | intern/cycles/util/util_thread.h | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/intern/cycles/util/util_thread.h b/intern/cycles/util/util_thread.h index 751d22b2f63..d7e9ec03df3 100644 --- a/intern/cycles/util/util_thread.h +++ b/intern/cycles/util/util_thread.h @@ -70,37 +70,6 @@ protected: bool joined; }; -/* Thread Local Storage - * - * Boost implementation is a bit slow, and Mac OS X __thread is not supported - * but the pthreads implementation is optimized, so we use these macros. */ - -#if defined(__APPLE__) || defined(_WIN32) - -#define tls_ptr(type, name) \ - pthread_key_t name -#define tls_set(name, value) \ - pthread_setspecific(name, value) -#define tls_get(type, name) \ - ((type*)pthread_getspecific(name)) -#define tls_create(type, name) \ - pthread_key_create(&name, NULL) -#define tls_delete(type, name) \ - pthread_key_delete(name); - -#else - -#define tls_ptr(type, name) \ - __thread type *name -#define tls_set(name, value) \ - name = value -#define tls_get(type, name) \ - name -#define tls_create(type, name) -#define tls_delete(type, name) - -#endif - CCL_NAMESPACE_END #endif /* __UTIL_THREAD_H__ */ |