From 5cc209bc152716589cf601dc5aec51e944afbba9 Mon Sep 17 00:00:00 2001 From: Krystian Ligenza Date: Sun, 23 Aug 2020 16:32:17 -0400 Subject: [PATCH 1/2] Removing code blocks for USD 19.07 --- doc/build.md | 2 +- .../render/pxrUsdMayaGL/batchRenderer.cpp | 4 --- lib/usd/hdMaya/adapters/materialAdapter.cpp | 36 ++----------------- lib/usd/schemas/CMakeLists.txt | 1 - 4 files changed, 4 insertions(+), 39 deletions(-) diff --git a/doc/build.md b/doc/build.md index 956d0fc6a3..d21b99cbb4 100644 --- a/doc/build.md +++ b/doc/build.md @@ -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.07](https://github.com/PixarAnimationStudios/USD/releases/tag/v19.07) or [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)
dev: [8a13d20](https://github.com/PixarAnimationStudios/USD/commit/8a13d20062d14d486b7e130d252c4652aab0263e) | +| 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)
dev: [8a13d20](https://github.com/PixarAnimationStudios/USD/commit/8a13d20062d14d486b7e130d252c4652aab0263e) | For additional information on building Pixar USD, see the ***Additional Build Instruction*** section below. diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/batchRenderer.cpp b/lib/mayaUsd/render/pxrUsdMayaGL/batchRenderer.cpp index 14775ce569..a6d3986cab 100644 --- a/lib/mayaUsd/render/pxrUsdMayaGL/batchRenderer.cpp +++ b/lib/mayaUsd/render/pxrUsdMayaGL/batchRenderer.cpp @@ -81,10 +81,6 @@ #include #endif -#if USD_VERSION_NUM < 1911 -#include -#endif - PXR_NAMESPACE_OPEN_SCOPE TF_DEFINE_PRIVATE_TOKENS( diff --git a/lib/usd/hdMaya/adapters/materialAdapter.cpp b/lib/usd/hdMaya/adapters/materialAdapter.cpp index e328eff590..30121497cb 100644 --- a/lib/usd/hdMaya/adapters/materialAdapter.cpp +++ b/lib/usd/hdMaya/adapters/materialAdapter.cpp @@ -375,13 +375,6 @@ class HdMayaShadingEngineAdapter : public HdMayaMaterialAdapter { connectedFileObj, filePath, GetDelegate()->GetParams().textureMemoryPerTexture); textureInstance.SetValue(textureResource); -#if USD_VERSION_NUM < 1911 - _textureResources[paramName] = textureResource; - } - else { - _textureResources[paramName] = textureInstance.GetValue(); - } -#else // USD_VERSION_NUM == 1911 } HdStTextureResourceSharedPtr texResource = @@ -410,7 +403,6 @@ class HdMayaShadingEngineAdapter : public HdMayaMaterialAdapter { handleInstance.GetValue()->SetTextureResource(texResource); } _textureResourceHandles[paramName] = handleInstance.GetValue(); -#endif // USD_VERSION_NUM < 1911 if (GlfIsSupportedUdimTexture(filePath)) { if (TfDebug::IsEnabled(HDMAYA_ADAPTER_MATERIALS) && @@ -430,11 +422,8 @@ class HdMayaShadingEngineAdapter : public HdMayaMaterialAdapter { .Msg( " ...failed registering texture - could not get " "textureID\n"); -#if USD_VERSION_NUM >= 1911 + _textureResourceHandles[paramName].reset(); -#else // USD_VERSION_NUM < 1911 - _textureResources[paramName].reset(); -#endif // USD_VERSION_NUM >= 1911 } } return false; @@ -454,11 +443,7 @@ class HdMayaShadingEngineAdapter : public HdMayaMaterialAdapter { for (const auto& it : HdMayaMaterialNetworkConverter::GetPreviewShaderParams()) { auto textureType = HdTextureType::Uv; -#if USD_VERSION_NUM >= 1911 auto remappedName = it.name; -#else // USD_VERSION_NUM < 1911 - auto remappedName = it.param.GetName(); -#endif // USD_VERSION_NUM >= 1911 auto attrConverter = nodeConverter->GetAttrConverter(remappedName); if (attrConverter) { TfToken tempName = attrConverter->GetPlugName(remappedName); @@ -467,13 +452,9 @@ class HdMayaShadingEngineAdapter : public HdMayaMaterialAdapter { if (_RegisterTexture(node, remappedName, textureType)) { ret.emplace_back( -#if USD_VERSION_NUM >= 1911 HdMaterialParam::ParamTypeTexture, it.name, it.fallbackValue, -#else // USD_VERSION_NUM < 1911 - HdMaterialParam::ParamTypeTexture, it.param.GetName(), - it.param.GetFallbackValue(), -#endif // USD_VERSION_NUM >= 1911 + GetID().AppendProperty(remappedName), _stSamplerCoords, textureType); @@ -481,7 +462,7 @@ class HdMayaShadingEngineAdapter : public HdMayaMaterialAdapter { .Msg( "HdMayaShadingEngineAdapter: registered texture with " "connection path: %s\n", -#if USD_VERSION_NUM >= 1911 + ret.back().connection.GetText()); } else { ret.emplace_back( @@ -489,12 +470,6 @@ class HdMayaShadingEngineAdapter : public HdMayaMaterialAdapter { it.name, it.fallbackValue); } -#else // USD_VERSION_NUM < 1911 - ret.back().GetConnection().GetText()); - } else { - ret.emplace_back(it.param); - } -#endif // USD_VERSION_NUM >= 1911 } return ret; @@ -526,13 +501,8 @@ class HdMayaShadingEngineAdapter : public HdMayaMaterialAdapter { auto attrConverter = nodeConverter->GetAttrConverter(paramName); if (attrConverter) { return attrConverter->GetValue( -#if USD_VERSION_NUM >= 1911 node, previewIt->name, previewIt->type, &previewIt->fallbackValue); -#else // USD_VERSION_NUM < 1911 - node, previewIt->param.GetName(), previewIt->type, - &previewIt->param.GetFallbackValue()); -#endif // USD_VERSION_NUM >= 1911 } else { return GetPreviewMaterialParamValue(paramName); } diff --git a/lib/usd/schemas/CMakeLists.txt b/lib/usd/schemas/CMakeLists.txt index ed47b21952..dbd59ce801 100644 --- a/lib/usd/schemas/CMakeLists.txt +++ b/lib/usd/schemas/CMakeLists.txt @@ -45,7 +45,6 @@ mayaUsd_promoteHeaderList(HEADERS ${HEADERS} target_include_directories(${TARGET_NAME} PUBLIC ${CMAKE_BINARY_DIR}/include - $<$:${USD_INCLUDE_DIR}> ) # ----------------------------------------------------------------------------- From 4a3876851c20502b3e8664c1f7917708d63f9f88 Mon Sep 17 00:00:00 2001 From: Krystian Ligenza Date: Mon, 24 Aug 2020 14:57:18 -0400 Subject: [PATCH 2/2] Good catch Hamed! Missed files --- .../shading/shadingModeExporterContext.cpp | 8 +---- .../render/mayaToHydra/renderOverride.cpp | 7 ---- .../render/mayaToHydra/renderOverride.h | 7 ---- lib/mayaUsd/render/mayaToHydra/utils.cpp | 8 ----- .../render/pxrUsdMayaGL/batchRenderer.cpp | 5 --- .../render/pxrUsdMayaGL/sceneDelegate.cpp | 4 --- .../pxrUsdMayaGL/usdProxyShapeAdapter.cpp | 13 -------- .../render/vp2RenderDelegate/material.cpp | 5 --- lib/usd/hdMaya/adapters/materialAdapter.cpp | 32 ++----------------- .../adapters/materialNetworkConverter.cpp | 17 ---------- .../adapters/materialNetworkConverter.h | 4 --- lib/usd/hdMaya/delegates/delegate.h | 7 ---- .../AL/usdmaya/nodes/ProxyShapeUI.cpp | 6 ---- 13 files changed, 3 insertions(+), 120 deletions(-) diff --git a/lib/mayaUsd/fileio/shading/shadingModeExporterContext.cpp b/lib/mayaUsd/fileio/shading/shadingModeExporterContext.cpp index d1aef40890..07b9513338 100644 --- a/lib/mayaUsd/fileio/shading/shadingModeExporterContext.cpp +++ b/lib/mayaUsd/fileio/shading/shadingModeExporterContext.cpp @@ -296,13 +296,7 @@ UsdMayaShadingModeExportContext::GetAssignments() const // If the bound prim's path is not below a bindable root, skip it. if (SdfPathFindLongestPrefix( -#if USD_VERSION_NUM >= 1911 - _bindableRoots, usdPath) == _bindableRoots.end()) { -#else - _bindableRoots.begin(), - _bindableRoots.end(), - usdPath) == _bindableRoots.end()) { -#endif + _bindableRoots, usdPath) == _bindableRoots.end()) { continue; } diff --git a/lib/mayaUsd/render/mayaToHydra/renderOverride.cpp b/lib/mayaUsd/render/mayaToHydra/renderOverride.cpp index 7be3104303..2ea2a3d925 100644 --- a/lib/mayaUsd/render/mayaToHydra/renderOverride.cpp +++ b/lib/mayaUsd/render/mayaToHydra/renderOverride.cpp @@ -47,14 +47,7 @@ #include "tokens.h" #include "utils.h" -#if USD_VERSION_NUM >= 1911 #include -#else -#include -PXR_NAMESPACE_OPEN_SCOPE -using HdRendererPluginRegistry = HdxRendererPluginRegistry; -PXR_NAMESPACE_CLOSE_SCOPE -#endif #include #include diff --git a/lib/mayaUsd/render/mayaToHydra/renderOverride.h b/lib/mayaUsd/render/mayaToHydra/renderOverride.h index fea38c79df..a3cb3ca263 100644 --- a/lib/mayaUsd/render/mayaToHydra/renderOverride.h +++ b/lib/mayaUsd/render/mayaToHydra/renderOverride.h @@ -38,14 +38,7 @@ #include #include -#if USD_VERSION_NUM >= 1911 #include -#else -#include -PXR_NAMESPACE_OPEN_SCOPE -using HdRendererPlugin = HdxRendererPlugin; -PXR_NAMESPACE_CLOSE_SCOPE -#endif #include #if WANT_UFE_BUILD diff --git a/lib/mayaUsd/render/mayaToHydra/utils.cpp b/lib/mayaUsd/render/mayaToHydra/utils.cpp index b139d7ab86..c72ed21b5b 100644 --- a/lib/mayaUsd/render/mayaToHydra/utils.cpp +++ b/lib/mayaUsd/render/mayaToHydra/utils.cpp @@ -21,16 +21,8 @@ #include "tokens.h" -#if USD_VERSION_NUM >= 1911 #include #include -#else -#include -#include -PXR_NAMESPACE_OPEN_SCOPE -using HdRendererPluginRegistry = HdxRendererPluginRegistry; -PXR_NAMESPACE_CLOSE_SCOPE -#endif PXR_NAMESPACE_OPEN_SCOPE diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/batchRenderer.cpp b/lib/mayaUsd/render/pxrUsdMayaGL/batchRenderer.cpp index a6d3986cab..1ef095d5b8 100644 --- a/lib/mayaUsd/render/pxrUsdMayaGL/batchRenderer.cpp +++ b/lib/mayaUsd/render/pxrUsdMayaGL/batchRenderer.cpp @@ -1112,13 +1112,8 @@ UsdMayaGLBatchRenderer::_GetIntersectionPrimFilters( nullptr, collection, TfTokenVector{ -#if USD_VERSION_NUM >= 1911 HdRenderTagTokens->geometry, HdRenderTagTokens->proxy} -#else - HdTokens->geometry, - UsdGeomTokens->proxy} -#endif }); } diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/sceneDelegate.cpp b/lib/mayaUsd/render/pxrUsdMayaGL/sceneDelegate.cpp index 8f1101219d..84d1f13cd4 100644 --- a/lib/mayaUsd/render/pxrUsdMayaGL/sceneDelegate.cpp +++ b/lib/mayaUsd/render/pxrUsdMayaGL/sceneDelegate.cpp @@ -152,11 +152,7 @@ PxrMayaHdSceneDelegate::PxrMayaHdSceneDelegate( { // By default we only want geometry in the shadow pass const TfTokenVector defaultShadowRenderTags = { -#if USD_VERSION_NUM >= 1911 HdRenderTagTokens->geometry, -#else - HdTokens->geometry -#endif }; renderIndex->InsertTask(this, _shadowTaskId); diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/usdProxyShapeAdapter.cpp b/lib/mayaUsd/render/pxrUsdMayaGL/usdProxyShapeAdapter.cpp index dde5db18f2..6defac9905 100644 --- a/lib/mayaUsd/render/pxrUsdMayaGL/usdProxyShapeAdapter.cpp +++ b/lib/mayaUsd/render/pxrUsdMayaGL/usdProxyShapeAdapter.cpp @@ -165,7 +165,6 @@ PxrMayaHdUsdProxyShapeAdapter::_Sync( // Update Render Tags _renderTags.clear(); -#if USD_VERSION_NUM >= 1911 _renderTags.push_back(HdRenderTagTokens->geometry); if (drawRenderPurpose) { _renderTags.push_back(HdRenderTagTokens->render); @@ -176,18 +175,6 @@ PxrMayaHdUsdProxyShapeAdapter::_Sync( if (drawGuidePurpose) { _renderTags.push_back(HdRenderTagTokens->guide); } -#else - _renderTags.push_back(HdTokens->geometry); - if (drawRenderPurpose) { - _renderTags.push_back(UsdGeomTokens->render); - } - if (drawProxyPurpose) { - _renderTags.push_back(UsdGeomTokens->proxy); - } - if (drawGuidePurpose) { - _renderTags.push_back(HdTokens->guide); - } -#endif MStatus status; const MMatrix transform = GetDagPath().inclusiveMatrix(&status); diff --git a/lib/mayaUsd/render/vp2RenderDelegate/material.cpp b/lib/mayaUsd/render/vp2RenderDelegate/material.cpp index f539365f06..868002940f 100644 --- a/lib/mayaUsd/render/vp2RenderDelegate/material.cpp +++ b/lib/mayaUsd/render/vp2RenderDelegate/material.cpp @@ -575,13 +575,8 @@ void HdVP2Material::Sync( HdMaterialNetwork bxdfNet, dispNet; -#if USD_VERSION_NUM >= 1911 TfMapLookup(networkMap.map, HdMaterialTerminalTokens->surface, &bxdfNet); TfMapLookup(networkMap.map, HdMaterialTerminalTokens->displacement, &dispNet); -#else - TfMapLookup(networkMap.map, UsdImagingTokens->bxdf, &bxdfNet); - TfMapLookup(networkMap.map, UsdImagingTokens->displacement, &dispNet); -#endif if (*dirtyBits & HdMaterial::DirtyResource) { // Apply VP2 fixes to the material network diff --git a/lib/usd/hdMaya/adapters/materialAdapter.cpp b/lib/usd/hdMaya/adapters/materialAdapter.cpp index 30121497cb..f370d0d714 100644 --- a/lib/usd/hdMaya/adapters/materialAdapter.cpp +++ b/lib/usd/hdMaya/adapters/materialAdapter.cpp @@ -41,9 +41,7 @@ #include #include -#if USD_VERSION_NUM >= 1911 #include -#endif PXR_NAMESPACE_OPEN_SCOPE @@ -164,11 +162,7 @@ HdMayaShaderParams::const_iterator _FindPreviewParam(const TfToken& id) { return std::lower_bound( previewShaderParams.cbegin(), previewShaderParams.cend(), id, [](const HdMayaShaderParam& param, const TfToken& id){ -#if USD_VERSION_NUM >= 1911 return param.name < id; -#else - return param.param.GetName() < id; -#endif } ); } @@ -184,11 +178,7 @@ const VtValue& HdMayaMaterialAdapter::GetPreviewMaterialParamValue( paramName.GetText()); return _emptyValue; } -#if USD_VERSION_NUM >= 1911 return it->fallbackValue; -#else - return it->param.GetFallbackValue(); -#endif } HdTextureResourceSharedPtr HdMayaMaterialAdapter::GetTextureResource( @@ -223,24 +213,14 @@ VtValue HdMayaMaterialAdapter::GetPreviewMaterialResource( HdMaterialNode node; node.path = materialID; node.identifier = UsdImagingTokens->UsdPreviewSurface; -#if USD_VERSION_NUM >= 1911 map.terminals.push_back(node.path); -#endif for (const auto& it : HdMayaMaterialNetworkConverter::GetPreviewShaderParams()) { node.parameters.emplace( -#if USD_VERSION_NUM >= 1911 it.name, it.fallbackValue); -#else - it.param.GetName(), it.param.GetFallbackValue()); -#endif } network.nodes.push_back(node); -#if USD_VERSION_NUM >= 1911 map.map.emplace(HdMaterialTerminalTokens->surface, network); -#else - map.map.emplace(UsdImagingTokens->bxdf, network); -#endif return VtValue(map); } @@ -592,15 +572,12 @@ class HdMayaShadingEngineAdapter : public HdMayaMaterialAdapter { } HdMaterialNetworkMap materialNetworkMap; -#if USD_VERSION_NUM >= 1911 materialNetworkMap.map[HdMaterialTerminalTokens->surface] = materialNetwork; if (!materialNetwork.nodes.empty()) { materialNetworkMap.terminals.push_back( materialNetwork.nodes.back().path); } -#else - materialNetworkMap.map[UsdImagingTokens->bxdf] = materialNetwork; -#endif + // HdMaterialNetwork displacementNetwork; // materialNetworkMap.map[HdMaterialTerminalTokens->displacement] = // displacementNetwork; @@ -649,15 +626,10 @@ class HdMayaShadingEngineAdapter : public HdMayaMaterialAdapter { TfToken _surfaceShaderType; // So they live long enough -#if USD_VERSION_NUM >= 1911 std::unordered_map< TfToken, HdStTextureResourceHandleSharedPtr, TfToken::HashFunctor> _textureResourceHandles; -#else // USD_VERSION_NUM >= 1911 - std::unordered_map< - TfToken, HdTextureResourceSharedPtr, TfToken::HashFunctor> - _textureResources; -#endif + MCallbackId _surfaceShaderCallback; #ifdef HDMAYA_OIT_ENABLED bool _isTranslucent = false; diff --git a/lib/usd/hdMaya/adapters/materialNetworkConverter.cpp b/lib/usd/hdMaya/adapters/materialNetworkConverter.cpp index 76c6f48d5e..dfab438007 100644 --- a/lib/usd/hdMaya/adapters/materialNetworkConverter.cpp +++ b/lib/usd/hdMaya/adapters/materialNetworkConverter.cpp @@ -494,12 +494,8 @@ HdMayaMaterialNodeConverter* HdMayaMaterialNodeConverter::GetNodeConverter( HdMayaShaderParam::HdMayaShaderParam( const TfToken& name, const VtValue& value, const SdfValueTypeName& type) : -#if USD_VERSION_NUM >= 1911 name(name) , fallbackValue(value) -#else - param(HdMaterialParam::ParamTypeFallback, name, value) -#endif , type(type) {} HdMayaMaterialNetworkConverter::HdMayaMaterialNetworkConverter( @@ -536,13 +532,8 @@ HdMaterialNode* HdMayaMaterialNetworkConverter::GetMaterial( for (const auto& param : HdMayaMaterialNetworkConverter::GetPreviewShaderParams()) { this->ConvertParameter( -#if USD_VERSION_NUM >= 1911 node, *nodeConverter, material, param.name, param.type, ¶m.fallbackValue); -#else - node, *nodeConverter, material, param.param.GetName(), - param.type, ¶m.param.GetFallbackValue()); -#endif } } else { for (auto& nameAttrConverterPair : nodeConverter->GetAttrConverters()) { @@ -700,11 +691,7 @@ HdMayaMaterialNetworkConverter::GetPreviewShaderParams() { _previewShaderParams.begin(), _previewShaderParams.end(), [](const HdMayaShaderParam& a, const HdMayaShaderParam& b) -> bool { -#if USD_VERSION_NUM >= 1911 return a.name < b.name; -#else - return a.param.GetName() < b.param.GetName(); -#endif }); _previewShaderParams_initialized = true; } @@ -731,14 +718,10 @@ HdMayaMaterialNetworkConverter::GetPreviewMaterialParamVector() { HdMayaMaterialNetworkConverter::GetPreviewShaderParams(); _previewMaterialParamVector.reserve(shaderParams.size()); for (const auto& it : shaderParams) { -#if USD_VERSION_NUM >= 1911 _previewMaterialParamVector.emplace_back( HdMaterialParam::ParamTypeFallback, it.name, it.fallbackValue); -#else - _previewMaterialParamVector.emplace_back(it.param); -#endif } _previewMaterialParamVector_initialized = true; } diff --git a/lib/usd/hdMaya/adapters/materialNetworkConverter.h b/lib/usd/hdMaya/adapters/materialNetworkConverter.h index 114d28b6c7..6c35528a33 100644 --- a/lib/usd/hdMaya/adapters/materialNetworkConverter.h +++ b/lib/usd/hdMaya/adapters/materialNetworkConverter.h @@ -29,12 +29,8 @@ PXR_NAMESPACE_OPEN_SCOPE struct HdMayaShaderParam { -#if USD_VERSION_NUM >= 1911 TfToken name; VtValue fallbackValue; -#else - HdMaterialParam param; -#endif SdfValueTypeName type; diff --git a/lib/usd/hdMaya/delegates/delegate.h b/lib/usd/hdMaya/delegates/delegate.h index 218cabf505..f20b840654 100644 --- a/lib/usd/hdMaya/delegates/delegate.h +++ b/lib/usd/hdMaya/delegates/delegate.h @@ -33,14 +33,7 @@ #include #include -#if USD_VERSION_NUM >= 1911 #include -#else -#include -PXR_NAMESPACE_OPEN_SCOPE -using HdRendererPlugin = HdxRendererPlugin; -PXR_NAMESPACE_CLOSE_SCOPE -#endif #if WANT_UFE_BUILD #include diff --git a/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/ProxyShapeUI.cpp b/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/ProxyShapeUI.cpp index 1e02f88d53..d17d2eb878 100644 --- a/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/ProxyShapeUI.cpp +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/ProxyShapeUI.cpp @@ -162,16 +162,10 @@ void ProxyShapeUI::draw(const MDrawRequest& request, M3dView& view) const unsigned int x, y, w, h; view.viewport(x, y, w, h); - #if USD_VERSION_NUM >= 1911 engine->SetCameraState( GfMatrix4d((model.inverse() * viewMatrix).matrix), GfMatrix4d(projection.matrix)); engine->SetRenderViewport(GfVec4d(x, y, w, h)); - #else - engine->SetCameraState( - GfMatrix4d((model.inverse() * viewMatrix).matrix), - GfMatrix4d(projection.matrix), GfVec4d(x, y, w, h)); - #endif switch(request.displayStyle()) {