Skip to content

Commit 534b22c

Browse files
mattyjamspixar-oss
authored andcommitted
work: account for task_group_base interface change in oneTBB 2022.0.0
The `m_wait_ctx` member being used in a narrow band of oneTBB versions was removed in a refactor that went into version [v2022.0.0](https://github.com/oneapi-src/oneTBB/releases/tag/v2022.0.0) which was released yesterday: uxlfoundation/oneTBB@1f52f50 This change accounts for the update in the new version of oneTBB and uses the newly added `m_wait_vertex` member to access the same context as before. Closes PixarAnimationStudios#3392 (Internal change: 2354795)
1 parent 03825bb commit 534b22c

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

pxr/base/work/dispatcher.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,11 @@ WorkDispatcher::WorkDispatcher()
3434
#if TBB_INTERFACE_VERSION_MAJOR >= 12
3535
inline tbb::detail::d1::wait_context&
3636
WorkDispatcher::_TaskGroup::_GetInternalWaitContext() {
37+
#if TBB_INTERFACE_VERSION_MINOR >= 14
38+
return m_wait_vertex.get_context();
39+
#else
3740
return m_wait_ctx;
41+
#endif
3842
}
3943
#endif
4044

0 commit comments

Comments
 (0)