[hdEmbree] ensure we respect PXR_WORK_THREAD_LIMIT

pxr/imaging/plugin/hdEmbree/renderer.cpp

@@ -19,13 +19,43 @@
 
 #include "pxr/base/tf/hash.h"
 
+#include <tbb/tbb_stddef.h>
+#if TBB_INTERFACE_VERSION_MAJOR < 12
+#include <tbb/task_scheduler_init.h>
+#endif
+
 #include <chrono>
+#include <memory>
 #include <thread>
 
 namespace {
 
 PXR_NAMESPACE_USING_DIRECTIVE
 
+// -------------------------------------------------------------------------
+// Old TBB workaround - can remove once OneTBB is mandatory
+// -------------------------------------------------------------------------
+
+#if TBB_INTERFACE_VERSION_MAJOR < 12
+// Make the calling context respect PXR_WORK_THREAD_LIMIT, if run from a thread
+// other than the main thread (ie, the renderThread)
+class _ScopedThreadScheduler {
+public:
+    _ScopedThreadScheduler() {
+        auto limit = WorkGetConcurrencyLimitEnvSetting();
+        if (limit != 0) {
+            _tbbTaskSchedInit =
+                std::make_unique<tbb::task_scheduler_init>(limit);
+        }
+    }
+
+    std::unique_ptr<tbb::task_scheduler_init> _tbbTaskSchedInit;
+};
+#else
+class _ScopedThreadScheduler {
+};
+#endif
+
 // -------------------------------------------------------------------------
 // General Ray Utilities
 // -------------------------------------------------------------------------
@@ -453,6 +483,7 @@ HdEmbreeRenderer::Render(HdRenderThread *renderThread)
 
         // Render by scheduling square tiles of the sample buffer in a parallel
         // for loop.
+        _ScopedThreadScheduler scheduler;
         // Always pass the renderThread to _RenderTiles to allow the first frame
         // to be interrupted.
         WorkParallelForN(numTilesX*numTilesY,