Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix build issue in older versions of USD (#2199) #2200

Merged
merged 2 commits into from
Jan 21, 2025
Merged

Fix build issue in older versions of USD (#2199) #2200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a472ad6
more fixes for older USD versions
compso Jan 21, 2025
290a326
expose legacy delegate Stop() declaration
compso Jan 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions libs/render_delegate/render_delegate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1670,7 +1670,11 @@ bool HdArnoldRenderDelegate::IsPauseSupported() const { return false; }

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

#if PXR_VERSION >= 2203
bool HdArnoldRenderDelegate::Stop(bool blocking)
#else
bool HdArnoldRenderDelegate::Stop()
#endif
{
_renderParam->Pause();
return true;
Expand Down
4 changes: 4 additions & 0 deletions libs/render_delegate/render_delegate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,12 +374,16 @@ class HdArnoldRenderDelegate final : public HdRenderDelegate {
bool IsStopped() const override;
#endif

#if PXR_VERSION >= 2203
/// Stop all of this delegate's background rendering threads. Default
/// implementation does nothing.
///
/// @return True if successful.
HDARNOLD_API
bool Stop(bool blocking = true) override;
#else
bool Stop() override;
#endif

/// Restart all of this delegate's background rendering threads previously
/// paused by a call to Stop. Default implementation does nothing.
Expand Down
2 changes: 2 additions & 0 deletions libs/render_delegate/rprim.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,12 +77,14 @@ class HdArnoldRprim : public HydraType {
/// @return Pointer to the Render Delegate.
HdArnoldRenderDelegate* GetRenderDelegate() { return _renderDelegate; }

#if PXR_VERSION >= 2203
/// Tracking render tag changes
void UpdateRenderTag(HdSceneDelegate *delegate, HdRenderParam *renderParam) override {
HdRprim::UpdateRenderTag(delegate, renderParam);
HdArnoldRenderParamInterrupt param(renderParam);
_shape.UpdateRenderTag(this, delegate, param);
}
#endif

/// Syncs internal data and arnold state with hydra.
void SyncShape(
Expand Down