diff options
author | Brecht Van Lommel <brecht@blender.org> | 2020-06-23 16:06:00 +0300 |
---|---|---|
committer | Brecht Van Lommel <brecht@blender.org> | 2020-06-24 15:32:06 +0300 |
commit | e389c05410b0a03eb76f5430801f37780bf4ee1b (patch) | |
tree | ce016e9a59b298d149071a1f86a6a1ee5914cf55 /intern | |
parent | a6c59863d38fa81a58744f7fc5b400254de5f59e (diff) |
Cleanup: move TBB includes into own header
Diffstat (limited to 'intern')
-rw-r--r-- | intern/cycles/util/CMakeLists.txt | 1 | ||||
-rw-r--r-- | intern/cycles/util/util_task.h | 12 | ||||
-rw-r--r-- | intern/cycles/util/util_tbb.h | 35 |
3 files changed, 37 insertions, 11 deletions
diff --git a/intern/cycles/util/CMakeLists.txt b/intern/cycles/util/CMakeLists.txt index 2ba30cdb8af..4f66ced1c5a 100644 --- a/intern/cycles/util/CMakeLists.txt +++ b/intern/cycles/util/CMakeLists.txt @@ -113,6 +113,7 @@ set(SRC_HEADERS util_string.h util_system.h util_task.h + util_tbb.h util_texture.h util_thread.h util_time.h diff --git a/intern/cycles/util/util_task.h b/intern/cycles/util/util_task.h index ef1d2d70800..a56ca62f62c 100644 --- a/intern/cycles/util/util_task.h +++ b/intern/cycles/util/util_task.h @@ -19,22 +19,12 @@ #include "util/util_list.h" #include "util/util_string.h" +#include "util/util_tbb.h" #include "util/util_thread.h" #include "util/util_vector.h" -#define TBB_SUPPRESS_DEPRECATED_MESSAGES 1 -#include <tbb/tbb.h> - -#if TBB_INTERFACE_VERSION_MAJOR >= 10 -# define WITH_TBB_GLOBAL_CONTROL -#endif - CCL_NAMESPACE_BEGIN -using tbb::blocked_range; -using tbb::enumerable_thread_specific; -using tbb::parallel_for; - class TaskPool; class TaskScheduler; diff --git a/intern/cycles/util/util_tbb.h b/intern/cycles/util/util_tbb.h new file mode 100644 index 00000000000..7a3dacb3a9d --- /dev/null +++ b/intern/cycles/util/util_tbb.h @@ -0,0 +1,35 @@ +/* + * Copyright 2011-2020 Blender Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef __UTIL_TBB_H__ +#define __UTIL_TBB_H__ + +#define TBB_SUPPRESS_DEPRECATED_MESSAGES 1 +#include <tbb/tbb.h> + +#if TBB_INTERFACE_VERSION_MAJOR >= 10 +# define WITH_TBB_GLOBAL_CONTROL +#endif + +CCL_NAMESPACE_BEGIN + +using tbb::blocked_range; +using tbb::enumerable_thread_specific; +using tbb::parallel_for; + +CCL_NAMESPACE_END + +#endif /* __UTIL_TBB_H__ */ |