Skip to content

Commit 83c7fab

Browse files
authored
Fix build issue in older versions of USD (#2199) (#2200)
* more fixes for older USD versions * expose legacy delegate Stop() declaration
1 parent 4260485 commit 83c7fab

File tree

3 files changed

+10
-0
lines changed

3 files changed

+10
-0
lines changed

libs/render_delegate/render_delegate.cpp

+4
Original file line numberDiff line numberDiff line change
@@ -1670,7 +1670,11 @@ bool HdArnoldRenderDelegate::IsPauseSupported() const { return false; }
16701670

16711671
bool HdArnoldRenderDelegate::IsStopSupported() const { return true; }
16721672

1673+
#if PXR_VERSION >= 2203
16731674
bool HdArnoldRenderDelegate::Stop(bool blocking)
1675+
#else
1676+
bool HdArnoldRenderDelegate::Stop()
1677+
#endif
16741678
{
16751679
_renderParam->Pause();
16761680
return true;

libs/render_delegate/render_delegate.h

+4
Original file line numberDiff line numberDiff line change
@@ -374,12 +374,16 @@ class HdArnoldRenderDelegate final : public HdRenderDelegate {
374374
bool IsStopped() const override;
375375
#endif
376376

377+
#if PXR_VERSION >= 2203
377378
/// Stop all of this delegate's background rendering threads. Default
378379
/// implementation does nothing.
379380
///
380381
/// @return True if successful.
381382
HDARNOLD_API
382383
bool Stop(bool blocking = true) override;
384+
#else
385+
bool Stop() override;
386+
#endif
383387

384388
/// Restart all of this delegate's background rendering threads previously
385389
/// paused by a call to Stop. Default implementation does nothing.

libs/render_delegate/rprim.h

+2
Original file line numberDiff line numberDiff line change
@@ -77,12 +77,14 @@ class HdArnoldRprim : public HydraType {
7777
/// @return Pointer to the Render Delegate.
7878
HdArnoldRenderDelegate* GetRenderDelegate() { return _renderDelegate; }
7979

80+
#if PXR_VERSION >= 2203
8081
/// Tracking render tag changes
8182
void UpdateRenderTag(HdSceneDelegate *delegate, HdRenderParam *renderParam) override {
8283
HdRprim::UpdateRenderTag(delegate, renderParam);
8384
HdArnoldRenderParamInterrupt param(renderParam);
8485
_shape.UpdateRenderTag(this, delegate, param);
8586
}
87+
#endif
8688

8789
/// Syncs internal data and arnold state with hydra.
8890
void SyncShape(

0 commit comments

Comments
 (0)