diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-04-25 14:49:13 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-04-25 14:49:13 +0400 |
| commit | 3f12beb4d0440da93ccbe67c76f23a2f15452aac (patch) | |
| tree | 3e3d34d0396a598abd4b40f8cc4de8d450d08d2c /source/blender/blenlib/BLI_threads.h | |
| parent | 6c3317612edce15095e3868e0cb3135e19eb77f2 (diff) | |
Fix #22123 and #22124: some problems with mutex locks, also tweak to
how removing opengl textures from outside main thread is done so it
happens as part of the main loop.
Diffstat (limited to 'source/blender/blenlib/BLI_threads.h')
| -rw-r--r-- | source/blender/blenlib/BLI_threads.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/blenlib/BLI_threads.h b/source/blender/blenlib/BLI_threads.h index a1e44f65200..6a0a711404c 100644 --- a/source/blender/blenlib/BLI_threads.h +++ b/source/blender/blenlib/BLI_threads.h @@ -65,7 +65,8 @@ int BLI_system_thread_count(void); /* gets the number of threads the system can #define LOCK_PREVIEW 1 #define LOCK_VIEWER 2 #define LOCK_CUSTOM1 3 -#define LOCK_RCACHE 2 +#define LOCK_RCACHE 4 +#define LOCK_OPENGL 5 void BLI_lock_thread(int type); void BLI_unlock_thread(int type); @@ -73,7 +74,7 @@ void BLI_unlock_thread(int type); /* Mutex Lock */ typedef pthread_mutex_t ThreadMutex; -#define BLI_MUTEX_INITIALIZER PTHREAD_MUTEX_INITIALIZER; +#define BLI_MUTEX_INITIALIZER PTHREAD_MUTEX_INITIALIZER void BLI_mutex_init(ThreadMutex *mutex); void BLI_mutex_lock(ThreadMutex *mutex); |