fixed nodedef name, fixed test output

AcademySoftwareFoundation · Oct 11, 2023 · a20052b · a20052b
1 parent 71b8efa
commit a20052b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/libraries/stdlib/genglsl/stdlib_genglsl_impl.mtlx b/libraries/stdlib/genglsl/stdlib_genglsl_impl.mtlx
@@ -755,9 +755,9 @@
 
 
   <!-- <creatematrix> -->
-  <implementation name="IM_creatematrix_vector3_matrix33_genglsl" nodedef="ND_creatematrix_vector3_matrix33_genglsl" file="mx_creatematrix_vector3_matrix33.glsl" function="mx_creatematrix_vector3_matrix33" target="genglsl" />
-  <implementation name="IM_creatematrix_vector3_matrix44_genglsl" nodedef="ND_creatematrix_vector3_matrix44_genglsl" file="mx_creatematrix_vector3_matrix44.glsl" function="mx_creatematrix_vector3_matrix44" target="genglsl" />
-  <implementation name="IM_creatematrix_vector4_matrix44_genglsl" nodedef="ND_creatematrix_vector4_matrix44_genglsl" file="mx_creatematrix_vector4_matrix44.glsl" function="mx_creatematrix_vector4_matrix44" target="genglsl" />
+  <implementation name="IM_creatematrix_vector3_matrix33_genglsl" nodedef="ND_creatematrix_vector3_matrix33" file="mx_creatematrix_vector3_matrix33.glsl" function="mx_creatematrix_vector3_matrix33" target="genglsl" />
+  <implementation name="IM_creatematrix_vector3_matrix44_genglsl" nodedef="ND_creatematrix_vector3_matrix44" file="mx_creatematrix_vector3_matrix44.glsl" function="mx_creatematrix_vector3_matrix44" target="genglsl" />
+  <implementation name="IM_creatematrix_vector4_matrix44_genglsl" nodedef="ND_creatematrix_vector4_matrix44" file="mx_creatematrix_vector4_matrix44.glsl" function="mx_creatematrix_vector4_matrix44" target="genglsl" />
 
 
   <!-- ======================================================================== -->

diff --git a/resources/Materials/TestSuite/stdlib/math/matrix.mtlx b/resources/Materials/TestSuite/stdlib/math/matrix.mtlx
@@ -1,32 +1,32 @@
 <?xml version="1.0"?>
 <materialx version="1.38">
-  <nodegraph name="creatematrix_vector3_matrix33_nodegraph">
+  <nodegraph name="creatematrix_vector3_matrix33">
     <creatematrix name="creatematrix_vector3_matrix33" type="matrix33" xpos="6.579710" ypos="-1.922414">
       <input name="in1" type="vector3" nodename="constant_vector3" />
       <input name="in2" type="vector3" nodename="constant_vector3" />
       <input name="in3" type="vector3" nodename="constant_vector3" />
     </creatematrix>
-    <output name="output_matrix33" type="matrix33" nodename="creatematrix_vector3_matrix33" xpos="9.202899" ypos="-1.681034" />
+    <output name="out" type="matrix33" nodename="creatematrix_vector3_matrix33" xpos="9.202899" ypos="-1.681034" />
     <constant name="constant_vector3" type="vector3" xpos="4.840580" ypos="-2.689655" />
   </nodegraph>
-  <nodegraph name="creatematrix_vector3_matrix44_nodegraph">
+  <nodegraph name="creatematrix_vector3_matrix44">
     <creatematrix name="creatematrix_vector3_matrix44" type="matrix44" xpos="6.579710" ypos="-1.922414">
       <input name="in1" type="vector3" nodename="constant_vector3" />
       <input name="in2" type="vector3" nodename="constant_vector3" />
       <input name="in3" type="vector3" nodename="constant_vector3" />
       <input name="in4" type="vector3" nodename="constant_vector3" />
     </creatematrix>
-    <output name="output_matrix44" type="matrix44" nodename="creatematrix_vector3_matrix44" xpos="9.202899" ypos="-1.681034" />
+    <output name="out" type="matrix44" nodename="creatematrix_vector3_matrix44" xpos="9.202899" ypos="-1.681034" />
     <constant name="constant_vector3" type="vector3" xpos="4.840580" ypos="-2.689655" />
   </nodegraph>
-  <nodegraph name="creatematrix_vector4_matrix44_nodegraph">
+  <nodegraph name="creatematrix_vector4_matrix44">
     <creatematrix name="creatematrix_vector4_matrix44" type="matrix44" xpos="6.579710" ypos="-1.922414">
       <input name="in1" type="vector4" nodename="constant_vector4" />
       <input name="in2" type="vector4" nodename="constant_vector4" />
       <input name="in3" type="vector4" nodename="constant_vector4" />
       <input name="in4" type="vector4" nodename="constant_vector4" />
     </creatematrix>
-    <output name="output_matrix44" type="matrix44" nodename="creatematrix_vector4_matrix44" xpos="9.202899" ypos="-1.681034" />
+    <output name="out" type="matrix44" nodename="creatematrix_vector4_matrix44" xpos="9.202899" ypos="-1.681034" />
     <constant name="constant_vector4" type="vector4" xpos="4.840580" ypos="-2.689655" />
   </nodegraph>
 </materialx>