diff options
| author | Hans Goudey <h.goudey@me.com> | 2021-01-15 20:04:53 +0300 |
|---|---|---|
| committer | Hans Goudey <h.goudey@me.com> | 2021-01-15 20:04:53 +0300 |
| commit | 3459f75f5b31e155bf549ec70dd2476dc810077e (patch) | |
| tree | 528e2b713707176258630106953002252b397dde /intern | |
| parent | 237e27e161c9ac3c6b9d74dae1cafb5ea55c0458 (diff) | |
| parent | 0b0e45252b11bbc1c0d96a3e04a4087d02f765e3 (diff) | |
Merge branch 'blender-v2.92-release'
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/device/device_cpu.cpp | 8 | ||||
| -rw-r--r-- | intern/cycles/kernel/osl/osl_services.h | 1 | ||||
| -rw-r--r-- | intern/cycles/util/util_task.cpp | 2 | ||||
| -rw-r--r-- | intern/cycles/util/util_task.h | 2 |
4 files changed, 7 insertions, 6 deletions
diff --git a/intern/cycles/device/device_cpu.cpp b/intern/cycles/device/device_cpu.cpp index bd00d4db775..fdfd3f83be6 100644 --- a/intern/cycles/device/device_cpu.cpp +++ b/intern/cycles/device/device_cpu.cpp @@ -951,7 +951,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; } @@ -1249,7 +1249,7 @@ class CPUDevice : public Device { void thread_render(DeviceTask &task) { - if (task_pool.canceled()) { + if (TaskPool::canceled()) { if (task.need_finish_queue == false) return; } @@ -1319,7 +1319,7 @@ class CPUDevice : public Device { task.release_tile(tile); - if (task_pool.canceled()) { + if (TaskPool::canceled()) { if (task.need_finish_queue == false) break; } @@ -1416,7 +1416,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); diff --git a/intern/cycles/kernel/osl/osl_services.h b/intern/cycles/kernel/osl/osl_services.h index 894d6e471ba..d8b29e3bc1c 100644 --- a/intern/cycles/kernel/osl/osl_services.h +++ b/intern/cycles/kernel/osl/osl_services.h @@ -27,6 +27,7 @@ #include <OSL/oslclosure.h> #include <OSL/oslexec.h> +#include <OSL/rendererservices.h> #ifdef WITH_PTEX class PtexCache; diff --git a/intern/cycles/util/util_task.cpp b/intern/cycles/util/util_task.cpp index 50c236ac968..949ba0a7b4d 100644 --- a/intern/cycles/util/util_task.cpp +++ b/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 */ diff --git a/intern/cycles/util/util_task.h b/intern/cycles/util/util_task.h index f2718600f30..7c39ed675b5 100644 --- a/intern/cycles/util/util_task.h +++ b/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; |