Merge pull request #734 from Autodesk/kxl-adsk/drop_19_07_support

Removing code blocks for USD 19.07

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) <br> 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) <br> dev: [8a13d20](https://github.com/PixarAnimationStudios/USD/commit/8a13d20062d14d486b7e130d252c4652aab0263e) |
 
 For additional information on building Pixar USD, see the ***Additional Build Instruction*** section below.
 

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;
         }
 

lib/mayaUsd/render/mayaToHydra/renderOverride.cpp

@@ -47,14 +47,7 @@
 #include "tokens.h"
 #include "utils.h"
 
-#if USD_VERSION_NUM >= 1911
 #include <pxr/imaging/hd/rendererPluginRegistry.h>
-#else
-#include <pxr/imaging/hdx/rendererPluginRegistry.h>
-PXR_NAMESPACE_OPEN_SCOPE
-using HdRendererPluginRegistry = HdxRendererPluginRegistry;
-PXR_NAMESPACE_CLOSE_SCOPE
-#endif
 #include <pxr/imaging/hdx/tokens.h>
 #include <pxr/imaging/hdx/renderTask.h>
 

lib/mayaUsd/render/mayaToHydra/renderOverride.h

@@ -38,14 +38,7 @@
 #include <pxr/imaging/hd/rprimCollection.h>
 #include <pxr/imaging/hdSt/renderDelegate.h>
 
-#if USD_VERSION_NUM >= 1911
 #include <pxr/imaging/hd/rendererPlugin.h>
-#else
-#include <pxr/imaging/hdx/rendererPlugin.h>
-PXR_NAMESPACE_OPEN_SCOPE
-using HdRendererPlugin = HdxRendererPlugin;
-PXR_NAMESPACE_CLOSE_SCOPE
-#endif
 #include <pxr/imaging/hdx/taskController.h>
 
 #if WANT_UFE_BUILD

lib/mayaUsd/render/mayaToHydra/utils.cpp

@@ -21,16 +21,8 @@
 
 #include "tokens.h"
 
-#if USD_VERSION_NUM >= 1911
 #include <pxr/imaging/hd/rendererPlugin.h>
 #include <pxr/imaging/hd/rendererPluginRegistry.h>
-#else
-#include <pxr/imaging/hdx/rendererPlugin.h>
-#include <pxr/imaging/hdx/rendererPluginRegistry.h>
-PXR_NAMESPACE_OPEN_SCOPE
-using HdRendererPluginRegistry = HdxRendererPluginRegistry;
-PXR_NAMESPACE_CLOSE_SCOPE
-#endif
 
 PXR_NAMESPACE_OPEN_SCOPE
 

lib/mayaUsd/render/pxrUsdMayaGL/batchRenderer.cpp

@@ -81,10 +81,6 @@
 #include <pxr/imaging/hgi/tokens.h>
 #endif
 
-#if USD_VERSION_NUM < 1911
-#include <pxr/usd/usdGeom/tokens.h>
-#endif
-
 PXR_NAMESPACE_OPEN_SCOPE
 
 TF_DEFINE_PRIVATE_TOKENS(
@@ -1116,13 +1112,8 @@ UsdMayaGLBatchRenderer::_GetIntersectionPrimFilters(
                 nullptr,
                 collection,
                 TfTokenVector{
-#if USD_VERSION_NUM >= 1911
                     HdRenderTagTokens->geometry,
                     HdRenderTagTokens->proxy}
-#else
-                    HdTokens->geometry,
-                    UsdGeomTokens->proxy}
-#endif
         });
     }
 

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<HdxShadowTask>(this, _shadowTaskId);

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);

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

lib/usd/hdMaya/adapters/materialAdapter.cpp

@@ -41,9 +41,7 @@
 #include <hdMaya/adapters/tokens.h>
 #include <hdMaya/utils.h>
 
-#if USD_VERSION_NUM >= 1911
 #include <pxr/imaging/hdSt/textureResourceHandle.h>
-#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);
 }
 
@@ -375,13 +355,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 +383,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 +402,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 +423,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,34 +432,24 @@ 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);
 
                 TF_DEBUG(HDMAYA_ADAPTER_MATERIALS)
                     .Msg(
                         "HdMayaShadingEngineAdapter: registered texture with "
                         "connection path: %s\n",
-#if USD_VERSION_NUM >= 1911
+
                         ret.back().connection.GetText());
             } else {
                 ret.emplace_back(
                     HdMaterialParam::ParamTypeTexture,
                     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 +481,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);
         }
@@ -622,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;
@@ -679,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;

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, &param.fallbackValue);
-#else
-                node, *nodeConverter, material, param.param.GetName(),
-                param.type, &param.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;
         }