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

updates for building with latest post-21.02 dev branch commit of core USD #1099

Merged
merged 5 commits into from
Jan 25, 2021
Merged

updates for building with latest post-21.02 dev branch commit of core USD #1099

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
697b2df
remove use of "texture" Hydra Bprim type token
mattyjams Jan 5, 2021
5ce0e98
remove coding error at the end of UsdMayaAdaptor::GetSchemaByName()
mattyjams Jan 9, 2021
25b0b70
pass UsdShadeConnectableAPI objects explicitly to API functions
mattyjams Jan 15, 2021
eb399e8
replace _SetMaterialId() with public version that does not take an Hd…
mattyjams Jan 15, 2021
50afcba
add most recent core USD release 21.02 and update dev branch commit a…
mattyjams Jan 15, 2021
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
2 changes: 1 addition & 1 deletion doc/build.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ See Pixar's official github page for instructions on how to build USD: https://g

| | ![](images/pxr.png) |
|:------------: |:---------------: |
| CommitID/Tags | release: [v19.11](https://github.com/PixarAnimationStudios/USD/releases/tag/v19.11) or [v20.02](https://github.com/PixarAnimationStudios/USD/releases/tag/v20.02) or [v20.05](https://github.com/PixarAnimationStudios/USD/releases/tag/v20.05) or [v20.08](https://github.com/PixarAnimationStudios/USD/releases/tag/v20.08) or [v20.11](https://github.com/PixarAnimationStudios/USD/releases/tag/v20.11) <br> dev: [5904885](https://github.com/PixarAnimationStudios/USD/commit/590488516d285de4352c96bd5a542f5c6a5829be) |
| CommitID/Tags | release: [v19.11](https://github.com/PixarAnimationStudios/USD/releases/tag/v19.11) or [v20.02](https://github.com/PixarAnimationStudios/USD/releases/tag/v20.02) or [v20.05](https://github.com/PixarAnimationStudios/USD/releases/tag/v20.05) or [v20.08](https://github.com/PixarAnimationStudios/USD/releases/tag/v20.08) or [v20.11](https://github.com/PixarAnimationStudios/USD/releases/tag/v20.11) or [v21.02](https://github.com/PixarAnimationStudios/USD/releases/tag/v21.02)<br> dev: [3378c5d](https://github.com/PixarAnimationStudios/USD/commit/3378c5dc17b24162db3d2fc05fe98ddacc475a6f) |

For additional information on building Pixar USD, see the ***Additional Build Instruction*** section below.

Expand Down
2 changes: 1 addition & 1 deletion lib/mayaUsd/fileio/shading/shadingModePxrRis.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ class PxrRisShadingModeExporter : public UsdMayaShadingModeExporter
= _ExportShadingNodeHelper(materialPrim, connectedDepFn, context, processedPaths)) {
UsdShadeConnectableAPI::ConnectToSource(
input,
UsdShadeShader(cPrim),
UsdShadeConnectableAPI(cPrim),
TfToken(UsdMayaShadingUtil::GetStandardAttrName(connectedPlug, false)));
}
}
Expand Down
2 changes: 0 additions & 2 deletions lib/mayaUsd/fileio/utils/adaptor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,8 +230,6 @@ UsdMayaAdaptor::SchemaAdaptor UsdMayaAdaptor::GetSchemaByName(const TfToken& sch
}
#endif

// We shouldn't be able to reach this (everything is either typed or API).
TF_CODING_ERROR("'%s' isn't a known API or typed schema", schemaName.GetText());
return SchemaAdaptor();
}

Expand Down
2 changes: 1 addition & 1 deletion lib/mayaUsd/render/mayaToHydra/shadingModeExporter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ class MtohShadingModeExporter : public UsdMayaShadingModeExporter {
return UsdShadeConnectableAPI::ConnectToSource(input, output);
}
return UsdShadeConnectableAPI::ConnectToSource(
input, outputShader, relationship.inputName,
input, outputShader.ConnectableAPI(), relationship.inputName,
UsdShadeAttributeType::Output, typeName);
}

Expand Down
4 changes: 4 additions & 0 deletions lib/mayaUsd/render/vp2RenderDelegate/basisCurves.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,11 @@ void HdVP2BasisCurves::Sync(
const SdfPath& id = GetId();

if (*dirtyBits & HdChangeTracker::DirtyMaterialId) {
#if HD_API_VERSION < 37
_SetMaterialId(delegate->GetRenderIndex().GetChangeTracker(), delegate->GetMaterialId(id));
#else
SetMaterialId(delegate->GetMaterialId(id));
#endif
}

if (HdChangeTracker::IsPrimvarDirty(*dirtyBits, id, HdTokens->normals)
Expand Down
4 changes: 4 additions & 0 deletions lib/mayaUsd/render/vp2RenderDelegate/mesh.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,11 @@ void HdVP2Mesh::Sync(
const SdfPath& id = GetId();

if (*dirtyBits & HdChangeTracker::DirtyMaterialId) {
#if HD_API_VERSION < 37
_SetMaterialId(delegate->GetRenderIndex().GetChangeTracker(), delegate->GetMaterialId(id));
#else
SetMaterialId(delegate->GetMaterialId(id));
#endif
}

if (HdChangeTracker::IsPrimvarDirty(*dirtyBits, id, HdTokens->normals)
Expand Down
8 changes: 1 addition & 7 deletions lib/mayaUsd/render/vp2RenderDelegate/render_delegate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ inline const TfTokenVector& _SupportedSprimTypes()
*/
inline const TfTokenVector& _SupportedBprimTypes()
{
static const TfTokenVector r { HdPrimTypeTokens->texture };
static const TfTokenVector r {};
return r;
}

Expand Down Expand Up @@ -710,9 +710,6 @@ void HdVP2RenderDelegate::DestroySprim(HdSprim* sPrim) { delete sPrim; }
HdBprim* HdVP2RenderDelegate::CreateBprim(const TfToken& typeId, const SdfPath& bprimId)
{
/*
if (typeId == HdPrimTypeTokens->texture) {
return new HdVP2Texture(this, bprimId);
}
if (typeId == HdPrimTypeTokens->renderBuffer) {
return new HdVP2RenderBuffer(bprimId);
}
Expand All @@ -736,9 +733,6 @@ HdBprim* HdVP2RenderDelegate::CreateBprim(const TfToken& typeId, const SdfPath&
HdBprim* HdVP2RenderDelegate::CreateFallbackBprim(const TfToken& typeId)
{
/*
if (typeId == HdPrimTypeTokens->texture) {
return new HdVP2Texture(this, SdfPath::EmptyPath());
}
if (typeId == HdPrimTypeTokens->renderBuffer) {
return new HdVP2RenderBuffer(SdfPath::EmptyPath());
}
Expand Down