diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2020-06-05 13:53:38 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2020-06-22 14:06:47 +0300 |
| commit | d8c2092b15de61a69bddbc082998a1dc786d73af (patch) | |
| tree | b04a183c85b986db1e0d99fbee94be75608afec7 /intern/cycles/util | |
| parent | ace3268482c6bfd9986815aaa6b027c99fa8e3f4 (diff) | |
Cycles: make TBB a required library dependency, and use in a few places
Now that the rest of Blender also relies on TBB, no point in maintaining custom
code for paraller_for and thread local storage.
Diffstat (limited to 'intern/cycles/util')
| -rw-r--r-- | intern/cycles/util/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | intern/cycles/util/util_task.h | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/intern/cycles/util/CMakeLists.txt b/intern/cycles/util/CMakeLists.txt index 16d47d57e69..2ba30cdb8af 100644 --- a/intern/cycles/util/CMakeLists.txt +++ b/intern/cycles/util/CMakeLists.txt @@ -29,7 +29,7 @@ set(SRC ) set(LIB - + ${TBB_LIBRARIES} ) if(WITH_CYCLES_STANDALONE) diff --git a/intern/cycles/util/util_task.h b/intern/cycles/util/util_task.h index 17ff47cb2d8..dcb6733e9fa 100644 --- a/intern/cycles/util/util_task.h +++ b/intern/cycles/util/util_task.h @@ -22,8 +22,15 @@ #include "util/util_thread.h" #include "util/util_vector.h" +#define TBB_SUPPRESS_DEPRECATED_MESSAGES 1 +#include <tbb/tbb.h> + CCL_NAMESPACE_BEGIN +using tbb::blocked_range; +using tbb::enumerable_thread_specific; +using tbb::parallel_for; + class Task; class TaskPool; class TaskScheduler; |