Update createShaderNodeImplementationForXXX interfaces to accept the direct element.

Author: ld-kerley

source/MaterialXGenHw/HwShaderGenerator.cpp

@@ -390,12 +390,12 @@ void HwShaderGenerator::addStageLightingUniforms(GenContext& context, ShaderStag
         numActiveLights->setValue(Value::createValue<int>(0));
     }
 }
-ShaderNodeImplPtr HwShaderGenerator::createShaderNodeImplForNodeGraph(const NodeDef& nodedef) const
+ShaderNodeImplPtr HwShaderGenerator::createShaderNodeImplForNodeGraph(const NodeGraph& nodegraph) const
 {
-    vector<OutputPtr> outputs = nodedef.getActiveOutputs();
+    vector<OutputPtr> outputs = nodegraph.getActiveOutputs();
     if (outputs.empty())
     {
-        throw ExceptionShaderGenError("NodeDef '" + nodedef.getName() + "' has no outputs defined");
+        throw ExceptionShaderGenError("NodeGraph '" + nodegraph.getName() + "' has no outputs defined");
     }
 
     const TypeDesc outputType = _typeSystem->getType(outputs[0]->getType());

source/MaterialXGenHw/HwShaderGenerator.h

@@ -64,7 +64,7 @@ class MX_GENHW_API HwShaderGenerator : public ShaderGenerator
     virtual string getVertexDataPrefix(const VariableBlock& vertexData) const = 0;
 
     /// Create the shader node implementation for a nodedef that has a NodeGraph implementation.
-    ShaderNodeImplPtr createShaderNodeImplForNodeGraph(const NodeDef& nodedef) const override;
+    ShaderNodeImplPtr createShaderNodeImplForNodeGraph(const NodeGraph& nodegraph) const override;
 
     // Note : the order must match the order defined in libraries/pbrlib/genglsl/lib/mx_closure_type.glsl
     // TODO : investigate build time mechanism for ensuring these stay in sync.

source/MaterialXGenMdl/MdlShaderGenerator.cpp

@@ -330,12 +330,12 @@ ShaderPtr MdlShaderGenerator::generate(const string& name, ElementPtr element, G
     return shader;
 }
 
-ShaderNodeImplPtr MdlShaderGenerator::createShaderNodeImplForNodeGraph(const NodeDef& nodedef) const
+ShaderNodeImplPtr MdlShaderGenerator::createShaderNodeImplForNodeGraph(const NodeGraph& nodegraph) const
 {
-    vector<OutputPtr> outputs = nodedef.getActiveOutputs();
+    vector<OutputPtr> outputs = nodegraph.getActiveOutputs();
     if (outputs.empty())
     {
-        throw ExceptionShaderGenError("NodeDef '" + nodedef.getName() + "' has no outputs defined");
+        throw ExceptionShaderGenError("NodeGraph '" + nodegraph.getName() + "' has no outputs defined");
     }
 
     const TypeDesc outputType = _typeSystem->getType(outputs[0]->getType());
@@ -349,27 +349,21 @@ ShaderNodeImplPtr MdlShaderGenerator::createShaderNodeImplForNodeGraph(const Nod
     return CompoundNodeMdl::create();
 }
 
-ShaderNodeImplPtr MdlShaderGenerator::createShaderNodeImplForImplementation(const NodeDef& nodedef) const
+ShaderNodeImplPtr MdlShaderGenerator::createShaderNodeImplForImplementation(const Implementation& implElement) const
 {
-    InterfaceElementPtr implElement = nodedef.getImplementation(getTarget());
-    if (!implElement)
-    {
-        return nullptr;
-    }
-
     // When `file` and `function` are provided we consider this node a user node
-    const string file = implElement->getTypedAttribute<string>("file");
-    const string function = implElement->getTypedAttribute<string>("function");
+    const string file = implElement.getTypedAttribute<string>("file");
+    const string function = implElement.getTypedAttribute<string>("function");
     // Or, if `sourcecode` is provided we consider this node a user node with inline implementation
     // inline implementations are not supposed to have replacement markers
-    const string sourcecode = implElement->getTypedAttribute<string>("sourcecode");
+    const string sourcecode = implElement.getTypedAttribute<string>("sourcecode");
     if ((!file.empty() && !function.empty()) || (!sourcecode.empty() && sourcecode.find("{{") == string::npos))
     {
         return CustomCodeNodeMdl::create();
     }
     if (file.empty() && sourcecode.empty())
     {
-        throw ExceptionShaderGenError("No valid MDL implementation found for '" + implElement->getName() + "'");
+        throw ExceptionShaderGenError("No valid MDL implementation found for '" + implElement.getName() + "'");
     }
     return SourceCodeNodeMdl::create();
 }

source/MaterialXGenMdl/MdlShaderGenerator.h

@@ -75,10 +75,10 @@ class MX_GENMDL_API MdlShaderGenerator : public ShaderGenerator
     ShaderPtr generate(const string& name, ElementPtr element, GenContext& context) const override;
 
     /// Create the shader node implementation for a nodedef that has a NodeGraph implementation.
-    ShaderNodeImplPtr createShaderNodeImplForNodeGraph(const NodeDef& nodedef) const override;
+    ShaderNodeImplPtr createShaderNodeImplForNodeGraph(const NodeGraph& nodegraph) const override;
 
     /// Create the shader node implementation for a nodedef that has a Implementation implementation.
-    ShaderNodeImplPtr createShaderNodeImplForImplementation(const NodeDef& nodedef) const override;
+    ShaderNodeImplPtr createShaderNodeImplForImplementation(const Implementation& implementation) const override;
 
     /// Return the result of an upstream connection or value for an input.
     string getUpstreamResult(const ShaderInput* input, GenContext& context) const override;

source/MaterialXGenShader/ShaderGenerator.cpp

@@ -285,12 +285,12 @@ bool ShaderGenerator::implementationRegistered(const string& name) const
     return _implFactory.classRegistered(name);
 }
 
-ShaderNodeImplPtr ShaderGenerator::createShaderNodeImplForNodeGraph(const NodeDef& /*nodedef*/) const
+ShaderNodeImplPtr ShaderGenerator::createShaderNodeImplForNodeGraph(const NodeGraph& /*nodegraph*/) const
 {
     return CompoundNode::create();
 }
 
-ShaderNodeImplPtr ShaderGenerator::createShaderNodeImplForImplementation(const NodeDef& /*nodedef*/) const
+ShaderNodeImplPtr ShaderGenerator::createShaderNodeImplForImplementation(const Implementation& /*implementation*/) const
 {
     return SourceCodeNode::create();
 }
@@ -314,7 +314,7 @@ ShaderNodeImplPtr ShaderGenerator::getImplementation(const NodeDef& nodedef, Gen
 
     if (implElement->isA<NodeGraph>())
     {
-        impl = createShaderNodeImplForNodeGraph(nodedef);
+        impl = createShaderNodeImplForNodeGraph(*implElement->asA<NodeGraph>());
     }
     else if (implElement->isA<Implementation>())
     {
@@ -329,7 +329,7 @@ ShaderNodeImplPtr ShaderGenerator::getImplementation(const NodeDef& nodedef, Gen
         }
         if (!impl)
         {
-            impl = createShaderNodeImplForImplementation(nodedef);
+            impl = createShaderNodeImplForImplementation(*implElement->asA<Implementation>());
         }
     }
     if (!impl)

source/MaterialXGenShader/ShaderGenerator.h

@@ -170,10 +170,10 @@ class MX_GENSHADER_API ShaderGenerator
     bool implementationRegistered(const string& name) const;
 
     /// Create the shader node implementation for a nodedef that has a NodeGraph implementation.
-    virtual ShaderNodeImplPtr createShaderNodeImplForNodeGraph(const NodeDef& nodedef) const;
+    virtual ShaderNodeImplPtr createShaderNodeImplForNodeGraph(const NodeGraph& nodegraph) const;
 
     /// Create the shader node implementation for a nodedef that has a Implementation implementation.
-    virtual ShaderNodeImplPtr createShaderNodeImplForImplementation(const NodeDef& nodedef) const;
+    virtual ShaderNodeImplPtr createShaderNodeImplForImplementation(const Implementation& implementation) const;
 
     /// Return a registered shader node implementation for the given nodedef.
     virtual ShaderNodeImplPtr getImplementation(const NodeDef& nodedef, GenContext& context) const;