diff options
Diffstat (limited to 'source/blender/blenlib')
| -rw-r--r-- | source/blender/blenlib/BLI_threads.h | 1 | ||||
| -rw-r--r-- | source/blender/blenlib/intern/threads.c | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/blenlib/BLI_threads.h b/source/blender/blenlib/BLI_threads.h index 3ccfcc023da..62eadb8a8b5 100644 --- a/source/blender/blenlib/BLI_threads.h +++ b/source/blender/blenlib/BLI_threads.h @@ -88,6 +88,7 @@ int BLI_system_num_threads_override_get(void); #define LOCK_NODES 6 #define LOCK_MOVIECLIP 7 #define LOCK_COLORMANAGE 8 +#define LOCK_FFTW 9 void BLI_lock_thread(int type); void BLI_unlock_thread(int type); diff --git a/source/blender/blenlib/intern/threads.c b/source/blender/blenlib/intern/threads.c index c9f4e9ddc15..ded2fd7e06d 100644 --- a/source/blender/blenlib/intern/threads.c +++ b/source/blender/blenlib/intern/threads.c @@ -121,6 +121,7 @@ static pthread_mutex_t _opengl_lock = PTHREAD_MUTEX_INITIALIZER; static pthread_mutex_t _nodes_lock = PTHREAD_MUTEX_INITIALIZER; static pthread_mutex_t _movieclip_lock = PTHREAD_MUTEX_INITIALIZER; static pthread_mutex_t _colormanage_lock = PTHREAD_MUTEX_INITIALIZER; +static pthread_mutex_t _fftw_lock = PTHREAD_MUTEX_INITIALIZER; static pthread_t mainid; static int thread_levels = 0; /* threads can be invoked inside threads */ static int num_threads_override = 0; @@ -399,6 +400,8 @@ void BLI_lock_thread(int type) pthread_mutex_lock(&_movieclip_lock); else if (type == LOCK_COLORMANAGE) pthread_mutex_lock(&_colormanage_lock); + else if (type == LOCK_FFTW) + pthread_mutex_lock(&_fftw_lock); } void BLI_unlock_thread(int type) @@ -421,6 +424,8 @@ void BLI_unlock_thread(int type) pthread_mutex_unlock(&_movieclip_lock); else if (type == LOCK_COLORMANAGE) pthread_mutex_unlock(&_colormanage_lock); + else if (type == LOCK_FFTW) + pthread_mutex_unlock(&_fftw_lock); } /* Mutex Locks */ |