Skip to content

Commit

Permalink
work: account for task_group_base interface change in oneTBB 2022.0.0
Browse files Browse the repository at this point in the history
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 #3392

(Internal change: 2354795)
  • Loading branch information
mattyjams authored and pixar-oss committed Jan 28, 2025
1 parent 03825bb commit 534b22c
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions pxr/base/work/dispatcher.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,11 @@ WorkDispatcher::WorkDispatcher()
#if TBB_INTERFACE_VERSION_MAJOR >= 12
inline tbb::detail::d1::wait_context&
WorkDispatcher::_TaskGroup::_GetInternalWaitContext() {
#if TBB_INTERFACE_VERSION_MINOR >= 14
return m_wait_vertex.get_context();
#else
return m_wait_ctx;
#endif
}
#endif

Expand Down

0 comments on commit 534b22c

Please sign in to comment.