diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-09-27 21:42:09 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-09-27 21:42:09 +0400 |
| commit | 46d82a2a1246c3a2497e591f604e4fc62c7b519d (patch) | |
| tree | 5815824d19397c9160d4d30c13a950d7ba72e206 /intern/cycles/render/image.h | |
| parent | 6ce0c433ce18f2bb159d8391c38731ca62ea2c8c (diff) | |
Fix #32618: cycles multithreaded image loading could crash with CUDA, was a
threading issue that happens once every X frames.
Diffstat (limited to 'intern/cycles/render/image.h')
| -rw-r--r-- | intern/cycles/render/image.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/intern/cycles/render/image.h b/intern/cycles/render/image.h index 04a705c27bf..8fb229282dc 100644 --- a/intern/cycles/render/image.h +++ b/intern/cycles/render/image.h @@ -22,6 +22,7 @@ #include "device_memory.h" #include "util_string.h" +#include "util_thread.h" #include "util_vector.h" CCL_NAMESPACE_BEGIN @@ -66,6 +67,7 @@ private: int tex_num_images; int tex_num_float_images; int tex_image_byte_start; + thread_mutex device_mutex; struct Image { string filename; |