diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2021-01-22 21:30:23 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2021-01-22 21:30:23 +0300 |
| commit | aaa1d580548d27d946a8f97fc7c6e99f8fd40f1c (patch) | |
| tree | 7ab66637f51d939affba32665fe5de49a7199878 /source/blender/blenlib/intern | |
| parent | 90bcd5e724f3ca6d6f38e3a0551c300751382e62 (diff) | |
| parent | a1f44e43a253eabee74f40315b62cc0c0ff4cb9c (diff) | |
Merge branch 'blender-v2.92-release'
Diffstat (limited to 'source/blender/blenlib/intern')
| -rw-r--r-- | source/blender/blenlib/intern/task_pool.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/source/blender/blenlib/intern/task_pool.cc b/source/blender/blenlib/intern/task_pool.cc index 4b545c5647e..10f15f8749c 100644 --- a/source/blender/blenlib/intern/task_pool.cc +++ b/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() |