updates for building with latest post-20.11 dev branch of core USD #889
Conversation
…elegateCtx::InsertRprim() HdRenderIndex::InsertInstancer() itself calls this, so there is no reason to do so again. It has been that way since at least as far back as core USD 19.11, so no USD API version guards are necessary. Starting after core USD 20.11, the signature of InstancerInserted() was changed to include the HdDirtyBits. This change corresponds to core USD commit PixarAnimationStudios/OpenUSD@5a73314 (Internal change: 2118195)
…tTokens This is some prep work for an upcoming UsdLux attribute names update. This change corresponds to core USD commit PixarAnimationStudios/OpenUSD@92e25a5 (Internal changes: 2119872, 2119882)
…ter when creating/inserting rprims This change corresponds to core USD commit PixarAnimationStudios/OpenUSD@6772ff6 (Internal change: 2120135)
This change corresponds to core USD commit PixarAnimationStudios/OpenUSD@b5d3809 (Internal change: 2120668)
UsdShadeConnectableAPI now has a concept of containers, and with that the existing IsShader() and IsNodeGraph() methods were deprecated. This change corresponds to core USD commit PixarAnimationStudios/OpenUSD@abda3f0 (Internal changes: 2123154, 2123308)
This identifies core USD commit f7b5f25 (post 20.11 release) as the most recent supported version of USD: PixarAnimationStudios/OpenUSD@f7b5f25
mattyjams
force-pushed
the
pr/update_to_current_core_USD_dev
branch
from
b201bc5 to
ae0eda4
Compare
|
Rebased to absorb clang-format changes from #890, and re-ran clang-format v10.0.0 on the modified files. |
| @@ -65,7 +65,11 @@ class HdMayaAiSkyDomeLightAdapter : public HdMayaLightAdapter | |||
| return VtValue(light.findPlug("aiExposure", true).asFloat()); | |||
| } else if (paramName == HdLightTokens->normalize) { | |||
| return VtValue(light.findPlug("aiNormalize", true).asBool()); | |||
| #if USD_VERSION_NUM >= 2102 | |||
There was a problem hiding this comment.
For my own education, when should we use USD_VERSION_NUM and when should we use HD_API_VERSION?
There was a problem hiding this comment.
Yeah, sorry, this is admittedly not very obvious.
Internally, our development cadence runs faster than the public USD release cycle, and the Hydra API in particular is changing fairly rapidly. We've been needing more fine-grained API guards to deal with that as we attempt to support several releases and mixed-component builds (internal-only stuff built on top of USD) across multiple shows. There isn't really a rigid structure around when API-level guards (HD_API_VERSION, USD_IMAGING_API_VERSION, etc.) get added or incremented. It's just done as needed to address a particular API change.
So externally to Pixar, the go-to should generally be USD_VERSION_NUM, since we don't really intend to support individual components of the public USD distribution being built separately from each other.
kxl-adsk
added
the
ready-for-merge
This PR includes a bunch of changes that go along with commits recently pushed to the dev branch of core USD. All supported releases of USD are still supported with these changes. The build.md was updated to reflect support up to the current dev branch commit.