Type description improvements

python/MaterialXTest/genshader.py

@@ -54,6 +54,7 @@ def test_ShaderInterface(self):
         self.assertTrue(foundTarget)
         context = mx_gen_shader.GenContext(shadergen)
         context.registerSourceCodeSearchPath(searchPath)
+        shadergen.registerTypeDefs(doc);
 
         # Test generator with complete mode
         context.getOptions().shaderInterfaceType = mx_gen_shader.ShaderInterfaceType.SHADER_INTERFACE_COMPLETE;

python/Scripts/generateshader.py

@@ -107,6 +107,7 @@ def main():
         codeSearchPath.append(os.path.dirname(inputFilename))
         context = mx_gen_shader.GenContext(shadergen)
         context.registerSourceCodeSearchPath(codeSearchPath)
+        shadergen.registerTypeDefs(doc);
 
         # If we're generating Vulkan-compliant GLSL then set the binding context
         if opts.vulkanCompliantGlsl:

resources/Materials/TestSuite/stdlib/structs/struct_texcoord.mtlx

@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<materialx version="1.39">
+
+  <typedef name="texcoord_struct">
+    <member name="ss" type="float" value="0.5"/>
+    <member name="tt" type="float" value="0.5"/>
+  </typedef>
+
+  <nodedef name="ND_extract_s_texcoord" node="extract_s" nodegroup="shader" >
+    <input name="in" type="texcoord_struct" value="{0.1;0.1}" />
+    <output name="out" type="float" value="0.0" />
+  </nodedef>
+
+  <implementation name="IM_extract_s_texcoord_genglsl" nodedef="ND_extract_s_texcoord" target="genglsl" sourcecode="{{in}}.ss" />
+  <implementation name="IM_extract_s_texcoord_genmsl" nodedef="ND_extract_s_texcoord" target="genmsl" sourcecode="{{in}}.ss" />
+  <implementation name="IM_extract_s_texcoord_genosl" nodedef="ND_extract_s_texcoord" target="genosl" sourcecode="{{in}}.ss" />
+  <implementation name="IM_extract_s_texcoord_genmdl" nodedef="ND_extract_s_texcoord" target="genmdl" sourcecode="{{in}}.ss" />
+
+  <extract_s name="extract" type="float">
+    <input name="in" type="texcoord_struct" value="{0.01;0.5}"/>
+  </extract_s>
+  <surface_unlit name="unlit_surface1" type="surfaceshader">
+    <input name="emission" type="float" nodename="extract" />
+    <input name="opacity" type="float" value="1.0" />
+  </surface_unlit>
+  <surfacematerial name="test_struct_texcoord" type="material">
+    <input name="surfaceshader" type="surfaceshader" nodename="unlit_surface1" />
+  </surfacematerial>
+
+</materialx>

resources/Materials/TestSuite/stdlib/structs/struct_texcoordGroup.mtlx

@@ -0,0 +1,43 @@
+<?xml version="1.0"?>
+<materialx version="1.38">
+
+  <typedef name="texcoord_struct">
+    <member name="ss" type="float" value="0.5"/>
+    <member name="tt" type="float" value="0.5"/>
+  </typedef>
+  <typedef name="texcoordGroup_struct">
+    <member name="st_0" type="texcoord_struct" value="{0.1;0.1}"/>
+    <member name="st_1" type="texcoord_struct" value="{0.5;0.5}"/>
+    <member name="st_2" type="texcoord_struct" value="{0.9;0.9}"/>
+  </typedef>
+
+  <nodedef name="ND_extract_first_s_texcoordGroup" node="extract_first_s_group" nodegroup="shader" >
+    <input name="in" type="texcoordGroup_struct" value="{{0.1;0.2};{0.3;0.4};{0.5;0.6}}"/>
+    <output name="out" type="float" value="0.0" />
+  </nodedef>
+
+  <implementation name="IM_extract_first_s_texcoordGroup_genglsl" nodedef="ND_extract_first_s_texcoordGroup" target="genglsl" sourcecode="{{in}}.st_0.ss">
+    <input name="in" type="texcoordGroup_struct" implname="data" />
+  </implementation>
+  <implementation name="IM_extract_first_s_texcoordGroup_genmdl" nodedef="ND_extract_first_s_texcoordGroup" target="genmdl" sourcecode="{{in}}.st_0.ss">
+    <input name="in" type="texcoordGroup_struct" implname="data" />
+  </implementation>
+  <implementation name="IM_extract_first_s_texcoordGroup_genmsl" nodedef="ND_extract_first_s_texcoordGroup" target="genmsl" sourcecode="{{in}}.st_0.ss">
+    <input name="in" type="texcoordGroup_struct" implname="data" />
+  </implementation>
+  <implementation name="IM_extract_first_s_texcoordGroup_genosl" nodedef="ND_extract_first_s_texcoordGroup" target="genosl" sourcecode="{{in}}.st_0.ss">
+    <input name="in" type="texcoordGroup_struct" implname="data" />
+  </implementation>
+
+  <extract_first_s_group name="extractfirstsgroup" type="float">
+    <input name="in" type="texcoordGroup_struct" value="{{0.1;0.2};{0.3;0.4};{0.5;0.6}}"/>
+  </extract_first_s_group>
+  <surface_unlit name="unlit_surface1" type="surfaceshader">
+    <input name="emission" type="float" nodename="extractfirstsgroup" />
+    <input name="opacity" type="float" value="1.0" />
+  </surface_unlit>
+  <surfacematerial name="test_struct_texcoordGroup" type="material">
+    <input name="surfaceshader" type="surfaceshader" nodename="unlit_surface1" />
+  </surfacematerial>
+
+</materialx>

source/MaterialXGenGlsl/EsslShaderGenerator.cpp

@@ -13,10 +13,10 @@ MATERIALX_NAMESPACE_BEGIN
 const string EsslShaderGenerator::TARGET = "essl";
 const string EsslShaderGenerator::VERSION = "300 es"; // Current target is WebGL 2.0
 
-EsslShaderGenerator::EsslShaderGenerator() :
-    GlslShaderGenerator()
+EsslShaderGenerator::EsslShaderGenerator(TypeSystemPtr typeSystem) :
+    GlslShaderGenerator(typeSystem)
 {
-    _syntax = EsslSyntax::create();
+    _syntax = EsslSyntax::create(typeSystem);
     // Add in ESSL specific keywords
     const StringSet reservedWords = { "precision", "highp", "mediump", "lowp" };
     _syntax->registerReservedWords(reservedWords);

source/MaterialXGenGlsl/EsslShaderGenerator.h

@@ -20,9 +20,17 @@ using EsslShaderGeneratorPtr = shared_ptr<class EsslShaderGenerator>;
 class MX_GENGLSL_API EsslShaderGenerator : public GlslShaderGenerator
 {
   public:
-    EsslShaderGenerator();
-
-    static ShaderGeneratorPtr create() { return std::make_shared<EsslShaderGenerator>(); }
+    /// Constructor.
+    /// Optionally pass in an externally created TypeSystem here, 
+    /// if you want to keep type descriptions alive after the lifetime
+    /// of the shader generator.
+    EsslShaderGenerator(TypeSystemPtr typeSystem = TypeSystem::create());
+
+    /// Creator function.
+    /// Optionally pass in an externally created TypeSystem here, 
+    /// if you want to keep type descriptions alive after the lifetime
+    /// of the shader generator.
+    static ShaderGeneratorPtr create(TypeSystemPtr typeSystem = TypeSystem::create()) { return std::make_shared<EsslShaderGenerator>(typeSystem); }
 
     /// Return a unique identifier for the target this generator is for
     const string& getTarget() const override { return TARGET; }

source/MaterialXGenGlsl/EsslSyntax.cpp

@@ -12,7 +12,7 @@
 
 MATERIALX_NAMESPACE_BEGIN
 
-EsslSyntax::EsslSyntax()
+EsslSyntax::EsslSyntax(TypeSystemPtr typeSystem) : GlslSyntax(typeSystem)
 {
 }
 

source/MaterialXGenGlsl/EsslSyntax.h

@@ -17,9 +17,9 @@ MATERIALX_NAMESPACE_BEGIN
 class MX_GENGLSL_API EsslSyntax : public GlslSyntax
 {
   public:
-    EsslSyntax();
+    EsslSyntax(TypeSystemPtr typeSystem);
 
-    static SyntaxPtr create() { return std::make_shared<EsslSyntax>(); }
+    static SyntaxPtr create(TypeSystemPtr typeSystem) { return std::make_shared<EsslSyntax>(typeSystem); }
 };
 
 MATERIALX_NAMESPACE_END

source/MaterialXGenGlsl/GlslShaderGenerator.cpp

@@ -41,8 +41,8 @@ const string GlslShaderGenerator::VERSION = "400";
 // GlslShaderGenerator methods
 //
 
-GlslShaderGenerator::GlslShaderGenerator() :
-    HwShaderGenerator(GlslSyntax::create())
+GlslShaderGenerator::GlslShaderGenerator(TypeSystemPtr typeSystem) :
+    HwShaderGenerator(typeSystem, GlslSyntax::create(typeSystem))
 {
     //
     // Register all custom node implementation classes
@@ -735,7 +735,7 @@ ShaderNodeImplPtr GlslShaderGenerator::getImplementation(const NodeDef& nodedef,
         throw ExceptionShaderGenError("NodeDef '" + nodedef.getName() + "' has no outputs defined");
     }
 
-    const TypeDesc outputType = TypeDesc::get(outputs[0]->getType());
+    const TypeDesc outputType = context.getTypeDesc(outputs[0]->getType());
 
     if (implElement->isA<NodeGraph>())
     {

source/MaterialXGenGlsl/GlslShaderGenerator.h

@@ -22,9 +22,17 @@ using GlslShaderGeneratorPtr = shared_ptr<class GlslShaderGenerator>;
 class MX_GENGLSL_API GlslShaderGenerator : public HwShaderGenerator
 {
   public:
-    GlslShaderGenerator();
-
-    static ShaderGeneratorPtr create() { return std::make_shared<GlslShaderGenerator>(); }
+    /// Constructor.
+    /// Optionally pass in an externally created TypeSystem here, 
+    /// if you want to keep type descriptions alive after the lifetime
+    /// of the shader generator.
+    GlslShaderGenerator(TypeSystemPtr typeSystem = TypeSystem::create());
+
+    /// Creator function.
+    /// Optionally pass in an externally created TypeSystem here, 
+    /// if you want to keep type descriptions alive after the lifetime
+    /// of the shader generator.
+    static ShaderGeneratorPtr create(TypeSystemPtr typeSystem = TypeSystem::create()) { return std::make_shared<GlslShaderGenerator>(typeSystem); }
 
     /// Generate a shader starting from the given element, translating
     /// the element and all dependencies upstream into shader code.