diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-11-09 07:10:22 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-11-09 07:10:22 +0400 |
| commit | f171d0f29c1394795c0a1dea2cb5118859e9ccdc (patch) | |
| tree | 7836b2214cafec9a04effc7de8560eda74bcc9db /intern/cycles/kernel/osl/osl_globals.h | |
| parent | 1c3640997c225d9bcd6e7559863d69366edc16ee (diff) | |
Fix #33125: cycles OSL crash with multiple render sessions running at the same time.
Diffstat (limited to 'intern/cycles/kernel/osl/osl_globals.h')
| -rw-r--r-- | intern/cycles/kernel/osl/osl_globals.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/intern/cycles/kernel/osl/osl_globals.h b/intern/cycles/kernel/osl/osl_globals.h index 5d557ffcb07..80ced9dfd62 100644 --- a/intern/cycles/kernel/osl/osl_globals.h +++ b/intern/cycles/kernel/osl/osl_globals.h @@ -68,6 +68,11 @@ struct OSLGlobals { }; static tls_ptr(ThreadData, thread_data); + static thread_mutex thread_data_mutex; + static volatile int thread_data_users; + + void thread_data_init(); + void thread_data_free(); }; CCL_NAMESPACE_END |