Work in progress

jstone-lucasfilm · Jan 30, 2025 · 50a16d8 · 50a16d8
1 parent 95fc7c5
commit 50a16d8
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 20 deletions.
diff --git a/resources/Materials/TestSuite/_options.mtlx b/resources/Materials/TestSuite/_options.mtlx
@@ -62,13 +62,13 @@
     <input name="extraLibraryPaths" type="string" value="" />
 
     <!-- List of document paths for render tests -->
-    <input name="renderTestPaths" type="string" value="resources/Materials/Examples/StandardSurface,resources/Materials/TestSuite/stdlib/convolution,resources/Materials/TestSuite/stdlib/color_management,resources/Materials/TestSuite/stdlib/procedural,resources/Materials/TestSuite/pbrlib/surfaceshader,resources/Materials/TestSuite/nprlib" />
+    <input name="renderTestPaths" type="string" value="resources/Materials/Examples/StandardSurface,resources/Materials/TestSuite/stdlib/convolution,resources/Materials/TestSuite/stdlib/color_management,resources/Materials/TestSuite/stdlib/procedural,resources/Materials/TestSuite/pbrlib/bsdf,resources/Materials/TestSuite/nprlib" />
 
     <!-- Enable reference quality rendering.
          This option enables higher sample counts and supersampling in render tests,
          allowing for visual comparisons and differencing across shading languages,
          but requiring a more powerful GPU and longer CPU render times.
     -->
-    <input name="enableReferenceQuality" type="boolean" value="false" />
+    <input name="enableReferenceQuality" type="boolean" value="true" />
   </nodedef>
 </materialx>
diff --git a/resources/Materials/TestSuite/pbrlib/bsdf/layer_bsdf.mtlx b/resources/Materials/TestSuite/pbrlib/bsdf/layer_bsdf.mtlx
@@ -1,31 +1,33 @@
 <?xml version="1.0"?>
 <materialx version="1.39">
   <nodegraph name="layer_bsdf_test1">
-    <oren_nayar_diffuse_bsdf name="diffuse_brdf_1" type="BSDF" />
-    <sheen_bsdf name="sheen_brdf_1" type="BSDF" />
-    <dielectric_bsdf name="dielectric_brdf_1" type="BSDF">
-      <input name="ior" type="float" value="2.5" />
+    <oren_nayar_diffuse_bsdf name="diffuse_bsdf_1" type="BSDF" />
+    <dielectric_bsdf name="dielectric_bsdf_1" type="BSDF">
+      <input name="weight" type="float" value="0.0" />
     </dielectric_bsdf>
-    <dielectric_bsdf name="dielectric_brdf_2" type="BSDF">
-      <input name="ior" type="float" value="1.2" />
-      <input name="tint" type="color3" value="1,0,0" />
+    <dielectric_bsdf name="dielectric_bsdf_2" type="BSDF">
+      <input name="weight" type="float" value="1.0" />
     </dielectric_bsdf>
     <layer name="layer_bsdf_1" type="BSDF">
-      <input name="top" type="BSDF" nodename="sheen_brdf_1" />
-      <input name="base" type="BSDF" nodename="diffuse_brdf_1" />
+      <input name="top" type="BSDF" nodename="dielectric_bsdf_1" />
+      <input name="base" type="BSDF" nodename="diffuse_bsdf_1" />
     </layer>
     <layer name="layer_bsdf_2" type="BSDF">
-      <input name="top" type="BSDF" nodename="dielectric_brdf_1" />
-      <input name="base" type="BSDF" nodename="layer_bsdf_1" />
+      <input name="top" type="BSDF" nodename="dielectric_bsdf_2" />
+      <input name="base" type="BSDF" nodename="diffuse_bsdf_1" />
     </layer>
-    <layer name="layer_bsdf_3" type="BSDF">
-      <input name="top" type="BSDF" nodename="dielectric_brdf_2" />
-      <input name="base" type="BSDF" nodename="layer_bsdf_2" />
-    </layer>
-    <surface name="surface1" type="surfaceshader">
-      <input name="bsdf" type="BSDF" nodename="layer_bsdf_3" />
+    <surface name="diffuse_surface" type="surfaceshader">
+      <input name="bsdf" type="BSDF" nodename="diffuse_bsdf_1" />
     </surface>
-    <output name="out" type="surfaceshader" nodename="surface1" />
+    <surface name="layer_0_surface" type="surfaceshader">
+      <input name="bsdf" type="BSDF" nodename="layer_bsdf_1" />
+    </surface>
+    <surface name="layer_1_surface" type="surfaceshader">
+      <input name="bsdf" type="BSDF" nodename="layer_bsdf_2" />
+    </surface>
+    <output name="diffuse_out" type="surfaceshader" nodename="diffuse_surface" />
+    <output name="layer_0_out" type="surfaceshader" nodename="layer_0_surface" />
+    <output name="layer_1_out" type="surfaceshader" nodename="layer_1_surface" />
   </nodegraph>
   <nodegraph name="layer_bsdf_test2">
     <dielectric_bsdf name="dielectric_R" type="BSDF">