# off during onetbb transition

#	OPENVDB

--- intern/cycles/device/device_cpu.cpp.orig	2021-01-21 07:59:12 UTC

+++ intern/cycles/device/device_cpu.cpp

@@ -927,7 +927,7 @@ class CPUDevice : public Device {

     SIMD_SET_FLUSH_TO_ZERO;

     for (int sample = start_sample; sample < end_sample; sample++) {

-      if (task.get_cancel() || task_pool.canceled()) {

+      if (task.get_cancel() || TaskPool::canceled()) {

         if (task.need_finish_queue == false)

           break;

       }

@@ -1220,7 +1220,7 @@ class CPUDevice : public Device {

   void thread_render(DeviceTask &task)

   {

-    if (task_pool.canceled()) {

+    if (TaskPool::canceled()) {

       if (task.need_finish_queue == false)

         return;

     }

@@ -1290,7 +1290,7 @@ class CPUDevice : public Device {

       task.release_tile(tile);

-      if (task_pool.canceled()) {

+      if (TaskPool::canceled()) {

         if (task.need_finish_queue == false)

           break;

       }

@@ -1387,7 +1387,7 @@ class CPUDevice : public Device {

                         task.offset,

                         sample);

-      if (task.get_cancel() || task_pool.canceled())

+      if (task.get_cancel() || TaskPool::canceled())

         break;

       task.update_progress(NULL);

--- intern/cycles/util/util_task.cpp.orig	2021-01-21 08:00:29 UTC

+++ intern/cycles/util/util_task.cpp

@@ -62,7 +62,7 @@ void TaskPool::cancel()

 bool TaskPool::canceled()

 {

-  return tbb_group.is_canceling();

+  return tbb::is_current_task_group_canceling();

 }

 /* Task Scheduler */

--- intern/cycles/util/util_task.h.orig	2021-01-21 08:01:04 UTC

+++ intern/cycles/util/util_task.h

@@ -61,7 +61,7 @@ class TaskPool {

   void wait_work(Summary *stats = NULL); /* work and wait until all tasks are done */

   void cancel(); /* cancel all tasks and wait until they are no longer executing */

-  bool canceled(); /* for worker threads, test if canceled */

+  static bool canceled(); /* For worker threads, test if current task pool canceled. */

  protected:

   tbb::task_group tbb_group;

--- intern/cycles/util/util_tbb.h.orig	2021-01-23 14:10:16 UTC

+++ intern/cycles/util/util_tbb.h

@@ -36,7 +36,14 @@ 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

--- source/blender/blenlib/BLI_index_range.hh.orig	2021-01-23 14:11:28 UTC

+++ source/blender/blenlib/BLI_index_range.hh

@@ -58,11 +58,6 @@

 #include "BLI_utildefines.h"

-/* Forward declare tbb::blocked_range for conversion operations. */

-namespace tbb {

-template<typename Value> class blocked_range;

-}

-

 namespace blender {

 template<typename T> class Span;

@@ -84,11 +79,6 @@ class IndexRange {

   {

     BLI_assert(start >= 0);

     BLI_assert(size >= 0);

-  }

-

-  template<typename T>

-  IndexRange(const tbb::blocked_range<T> &range) : start_(range.begin()), size_(range.size())

-  {

   }

   class Iterator {

--- source/blender/blenlib/BLI_task.h.orig	2021-01-21 08:02:26 UTC

+++ source/blender/blenlib/BLI_task.h

@@ -104,8 +104,10 @@ void BLI_task_pool_work_and_wait(TaskPool *pool);

 /* cancel all tasks, keep worker threads running */

 void BLI_task_pool_cancel(TaskPool *pool);

-/* for worker threads, test if canceled */

-bool BLI_task_pool_canceled(TaskPool *pool);

+/* for worker threads, test if current task pool canceled. this function may

+ * only be called from worker threads and pool must be the task pool that the

+ * thread is currently executing a task from. */

+bool BLI_task_pool_current_canceled(TaskPool *pool);

 /* optional userdata pointer to pass along to run function */

 void *BLI_task_pool_user_data(TaskPool *pool);

--- source/blender/blenlib/intern/task_pool.cc.orig	2020-11-25 19:01:32 UTC

+++ source/blender/blenlib/intern/task_pool.cc

@@ -131,6 +131,12 @@ class TBBTaskGroup : public tbb::task_group {

  public:

   TBBTaskGroup(TaskPriority priority)

   {

+#  if TBB_INTERFACE_VERSION_MAJOR >= 12

+    /* TODO: support priorities in TBB 2021, where they are only available as

+     * part of task arenas, no longer for task groups. Or remove support for

+     * task priorities if they are no longer useful. */

+    UNUSED_VARS(priority);

+#  else

     switch (priority) {

       case TASK_PRIORITY_LOW:

         my_context.set_priority(tbb::priority_low);

@@ -139,6 +145,7 @@ class TBBTaskGroup : public tbb::task_group {

         my_context.set_priority(tbb::priority_normal);

         break;

     }

+#endif

   }

   ~TBBTaskGroup()

@@ -268,7 +275,7 @@ static bool tbb_task_pool_canceled(TaskPool *pool)

 {

 #ifdef WITH_TBB

   if (pool->use_threads) {

-    return pool->tbb_group.is_canceling();

+    return tbb::is_current_task_group_canceling();

   }

 #else

   UNUSED_VARS(pool);

@@ -520,7 +527,7 @@ void BLI_task_pool_cancel(TaskPool *pool)

   }

 }

-bool BLI_task_pool_canceled(TaskPool *pool)

+bool BLI_task_pool_current_canceled(TaskPool *pool)

 {

   switch (pool->type) {

     case TASK_POOL_TBB: