diff options
author | Howard Trickey <howard.trickey@gmail.com> | 2021-10-30 22:37:05 +0300 |
---|---|---|
committer | Howard Trickey <howard.trickey@gmail.com> | 2021-10-30 22:37:05 +0300 |
commit | e9bbfd0c8c7a508d220bf355722ff03f91e93183 (patch) | |
tree | 1230f26bc82f24547aeccbaa7fcd6d3db2655fd3 /intern/cycles/util/util_tbb.h | |
parent | 1aa953bd1913c81b22c80a00edbf4ad88a32c52f (diff) | |
parent | 03a962d8cab44221650f59eb223cb0a767e05b2b (diff) |
Merge branch 'master' into soc-2020-io-performancesoc-2020-io-performance
Diffstat (limited to 'intern/cycles/util/util_tbb.h')
-rw-r--r-- | intern/cycles/util/util_tbb.h | 55 |
1 files changed, 0 insertions, 55 deletions
diff --git a/intern/cycles/util/util_tbb.h b/intern/cycles/util/util_tbb.h deleted file mode 100644 index 8f84377ac8c..00000000000 --- a/intern/cycles/util/util_tbb.h +++ /dev/null @@ -1,55 +0,0 @@ -/* - * 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__ - -/* TBB includes <windows.h>, do it ourselves first so we are sure - * WIN32_LEAN_AND_MEAN and similar are defined beforehand. */ -#include "util_windows.h" - -#include <tbb/enumerable_thread_specific.h> -#include <tbb/parallel_for.h> -#include <tbb/parallel_for_each.h> -#include <tbb/task_arena.h> -#include <tbb/task_group.h> - -#if TBB_INTERFACE_VERSION_MAJOR >= 10 -# define WITH_TBB_GLOBAL_CONTROL -# include <tbb/global_control.h> -#endif - -CCL_NAMESPACE_BEGIN - -using tbb::blocked_range; -using tbb::enumerable_thread_specific; -using tbb::parallel_for; - -static inline void parallel_for_cancel() -{ -#if TBB_INTERFACE_VERSION_MAJOR >= 12 - tbb::task_group_context *ctx = tbb::task::current_context(); - if (ctx) { - ctx->cancel_group_execution(); - } -#else - tbb::task::self().cancel_group_execution(); -#endif -} - -CCL_NAMESPACE_END - -#endif /* __UTIL_TBB_H__ */ |