No lobe pruning for MaterialX < 1.38.8

Author: JGamache-autodesk

lib/mayaUsd/render/vp2RenderDelegate/material.cpp

@@ -65,10 +65,12 @@
 
 #ifdef WANT_MATERIALX_BUILD
 #include <mayaUsd/render/MaterialXGenOgsXml/CombinedMaterialXVersion.h>
-#include <mayaUsd/render/MaterialXGenOgsXml/LobePruner.h>
 #include <mayaUsd/render/MaterialXGenOgsXml/OgsFragment.h>
 #include <mayaUsd/render/MaterialXGenOgsXml/OgsXmlGenerator.h>
 #include <mayaUsd/render/MaterialXGenOgsXml/ShaderGenUtil.h>
+#if MX_COMBINED_VERSION >= 13808
+#include <mayaUsd/render/MaterialXGenOgsXml/LobePruner.h>
+#endif
 
 #include <MaterialXCore/Document.h>
 #include <MaterialXFormat/File.h>
@@ -354,6 +356,7 @@ struct _MaterialXData
             static const std::string env = TfGetenv("USDMTLX_PRIMARY_UV_NAME");
             _mainUvSetName = env.empty() ? UsdUtilsGetPrimaryUVSetName().GetString() : env;
 
+#if MX_COMBINED_VERSION >= 13808
             _lobePruner = MaterialXMaya::ShaderGenUtil::LobePruner::create();
             _lobePruner->setLibrary(_mtlxLibrary);
 
@@ -366,6 +369,7 @@ struct _MaterialXData
             // NodeGraph boundary, then no optimization will be found. This would require a change
             // in the LobePruner to detect transitive weights. Doable, but complex. We will wait
             // until there is sufficient demand.
+#endif
         } catch (mx::Exception& e) {
             TF_RUNTIME_ERROR(
                 "Caught exception '%s' while initializing MaterialX library", e.what());
@@ -374,7 +378,9 @@ struct _MaterialXData
     MaterialX::FileSearchPath _mtlxSearchPath; //!< MaterialX library search path
     MaterialX::DocumentPtr    _mtlxLibrary;    //!< MaterialX library
     std::string               _mainUvSetName;  //!< Main UV set name
+#if MX_COMBINED_VERSION >= 13808
     MaterialXMaya::ShaderGenUtil::LobePruner::Ptr _lobePruner;
+#endif
 
 private:
     void _FixLibraryTangentInputs(MaterialX::DocumentPtr& mtlxLibrary);
@@ -476,13 +482,16 @@ size_t _GenerateNetwork2TopoHash(const HdMaterialNetwork2& materialNetwork)
         MayaUsd::hash_combine(topoHash, hash_value(nodePair.first));
 
         const auto& node = nodePair.second;
-        TfToken     optimizedNodeId = _GetMaterialXData()._lobePruner->getOptimizedNodeId(node);
+#if MX_COMBINED_VERSION >= 13808
+        TfToken optimizedNodeId = _GetMaterialXData()._lobePruner->getOptimizedNodeId(node);
         if (optimizedNodeId.IsEmpty()) {
             MayaUsd::hash_combine(topoHash, hash_value(node.nodeTypeId));
         } else {
             MayaUsd::hash_combine(topoHash, hash_value(optimizedNodeId));
         }
-
+#else
+        MayaUsd::hash_combine(topoHash, hash_value(node.nodeTypeId));
+#endif
         if (_IsTopologicalNode(node)) {
             // We need to capture values that affect topology:
             for (auto const& p : node.parameters) {
@@ -2902,13 +2911,16 @@ void HdVP2Material::CompiledNetwork::_ApplyMtlxVP2Fixes(
     for (const auto& nodePair : inNet.nodes) {
         const HdMaterialNode2& inNode = nodePair.second;
         HdMaterialNode2        outNode;
+#if MX_COMBINED_VERSION >= 13808
         TfToken optimizedNodeId = _GetMaterialXData()._lobePruner->getOptimizedNodeId(inNode);
         if (optimizedNodeId.IsEmpty()) {
             outNode.nodeTypeId = inNode.nodeTypeId;
         } else {
             outNode.nodeTypeId = optimizedNodeId;
         }
-
+#else
+        outNode.nodeTypeId = inNode.nodeTypeId;
+#endif
         if (_IsTopologicalNode(inNode)) {
             // These parameters affect topology:
             outNode.parameters = inNode.parameters;
@@ -3024,9 +3036,13 @@ MHWRender::MShaderInstance* HdVP2Material::CompiledNetwork::_CreateMaterialXShad
 
         mx::DocumentPtr           mtlxDoc;
         const mx::FileSearchPath& crLibrarySearchPath(_GetMaterialXData()._mtlxSearchPath);
+#if MX_COMBINED_VERSION >= 13808
         if (mtlxSdrNode
             || MaterialXMaya::ShaderGenUtil::LobePruner::isOptimizedNodeId(
                 surfTerminal->nodeTypeId)) {
+#else
+        if (mtlxSdrNode) {
+#endif
 
 #ifdef HAS_COLOR_MANAGEMENT_SUPPORT_API
             mx::DocumentPtr completeLibrary = mx::createDocument();