Extend Chiang tests across languages (AcademySoftwareFoundation#2104)

This changelist extends testing of Chiang Hair BSDF nodes across shading languages, allowing render comparisons to include the complete Examples and TestSuite folders. In order to avoid shader compilation errors, placeholder OSL implementations of these nodes have been added, and these should be replaced with accurate implementations once they are supported.
jstone-lucasfilm · Nov 2, 2024 · bef88b9 · bef88b9
1 parent 4339aaa
commit bef88b9
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 15 deletions.
diff --git a/libraries/pbrlib/genosl/mx_chiang_hair_roughness.osl b/libraries/pbrlib/genosl/mx_chiang_hair_roughness.osl
@@ -0,0 +1,7 @@
+void mx_chiang_hair_roughness(float longitudinal, float azimuthal, float scale_TT, float scale_TRT, output vector2 roughness_R, output vector2 roughness_TT, output vector2 roughness_TRT)
+{
+    // TODO: Write OSL implementation of this node.
+    roughness_R = vector2(0.0, 0.0);
+    roughness_TT = vector2(0.0, 0.0);
+    roughness_TRT = vector2(0.0, 0.0);
+}
diff --git a/libraries/pbrlib/genosl/pbrlib_genosl_impl.mtlx b/libraries/pbrlib/genosl/pbrlib_genosl_impl.mtlx
@@ -22,6 +22,9 @@
   <!-- <subsurface_bsdf> -->
   <implementation name="IM_subsurface_bsdf_genosl" nodedef="ND_subsurface_bsdf" file="mx_subsurface_bsdf.osl" function="mx_subsurface_bsdf" target="genosl" />
 
+  <!-- <chiang_hair_bsdf> -->
+  <implementation name="IM_chiang_hair_bsdf_genosl" nodedef="ND_chiang_hair_bsdf" sourcecode="oren_nayar_diffuse_bsdf({{normal}}, {{tint_R}}, 0.0)" target="genosl" />
+
   <!-- <sheen_bsdf> -->
   <implementation name="IM_sheen_bsdf_genosl" nodedef="ND_sheen_bsdf" sourcecode="{{weight}} * sheen_bsdf({{normal}}, {{color}}, {{roughness}})" target="genosl" />
 
@@ -71,4 +74,13 @@
   <!-- <blackbody> -->
   <implementation name="IM_blackbody_genosl" nodedef="ND_blackbody" file="mx_blackbody.osl" function="mx_blackbody" target="genosl" />
 
+  <!-- <deon_hair_absorption_from_melanin> -->
+  <implementation name="IM_deon_hair_absorption_from_melanin_genosl" nodedef="ND_deon_hair_absorption_from_melanin" sourcecode="vector(1.0)" target="genosl" />
+
+  <!-- <chiang_hair_absorption_from_color> -->
+  <implementation name="IM_chiang_hair_absorption_from_color_genosl" nodedef="ND_chiang_hair_absorption_from_color" sourcecode="vector(1.0)" target="genosl" />
+
+  <!-- <chiang_hair_roughness> -->
+  <implementation name="IM_chiang_hair_roughness_genosl" nodedef="ND_chiang_hair_roughness" file="mx_chiang_hair_roughness.osl" function="mx_chiang_hair_roughness" target="genosl" />
+
 </materialx>
diff --git a/...ials/TestSuite/pbrlib/bsdf/hair_bsdf.mtlx → ...stSuite/pbrlib/bsdf/chiang_hair_bsdf.mtlx b/...ials/TestSuite/pbrlib/bsdf/hair_bsdf.mtlx → ...stSuite/pbrlib/bsdf/chiang_hair_bsdf.mtlx
diff --git a/...lib/surfaceshader/hair_surfaceshader.mtlx → ...faceshader/chiang_hair_surfaceshader.mtlx b/...lib/surfaceshader/hair_surfaceshader.mtlx → ...faceshader/chiang_hair_surfaceshader.mtlx
diff --git a/source/MaterialXTest/MaterialXGenMsl/GenMsl.cpp b/source/MaterialXTest/MaterialXGenMsl/GenMsl.cpp
@@ -84,12 +84,7 @@ TEST_CASE("GenShader: MSL Implementation Check", "[genmsl]")
 
     mx::StringSet generatorSkipNodeTypes;
     mx::StringSet generatorSkipNodeDefs;
-    generatorSkipNodeDefs.insert("ND_chiang_hair_roughness");
-    generatorSkipNodeDefs.insert("ND_chiang_hair_absorption_from_color");
-    generatorSkipNodeDefs.insert("ND_deon_hair_absorption_from_melanin");
-    generatorSkipNodeDefs.insert("ND_chiang_hair_bsdf");
-
-    GenShaderUtil::checkImplementations(context, generatorSkipNodeTypes, generatorSkipNodeDefs, 34);
+    GenShaderUtil::checkImplementations(context, generatorSkipNodeTypes, generatorSkipNodeDefs, 30);
 }
 
 TEST_CASE("GenShader: MSL Unique Names", "[genmsl]")

diff --git a/source/MaterialXTest/MaterialXGenMsl/GenMsl.h b/source/MaterialXTest/MaterialXGenMsl/GenMsl.h
@@ -43,8 +43,6 @@ class MslShaderGeneratorTester : public GenShaderUtil::ShaderGeneratorTester
 
     void addSkipFiles() override
     {
-        _skipFiles.insert("hair_bsdf.mtlx");
-        _skipFiles.insert("hair_surfaceshader.mtlx");
     }
 
     void setupDependentLibraries() override

diff --git a/source/MaterialXTest/MaterialXGenOsl/GenOsl.cpp b/source/MaterialXTest/MaterialXGenOsl/GenOsl.cpp
@@ -89,12 +89,8 @@ TEST_CASE("GenShader: OSL Implementation Check", "[genosl]")
     generatorSkipNodeTypes.insert("light");
 
     mx::StringSet generatorSkipNodeDefs;
-    generatorSkipNodeDefs.insert("ND_chiang_hair_roughness");
-    generatorSkipNodeDefs.insert("ND_chiang_hair_absorption_from_color");
-    generatorSkipNodeDefs.insert("ND_deon_hair_absorption_from_melanin");
-    generatorSkipNodeDefs.insert("ND_chiang_hair_bsdf");
 
-    GenShaderUtil::checkImplementations(context, generatorSkipNodeTypes, generatorSkipNodeDefs, 35);
+    GenShaderUtil::checkImplementations(context, generatorSkipNodeTypes, generatorSkipNodeDefs, 31);
 }
 
 TEST_CASE("GenShader: OSL Unique Names", "[genosl]")

diff --git a/source/MaterialXTest/MaterialXGenOsl/GenOsl.h b/source/MaterialXTest/MaterialXGenOsl/GenOsl.h
@@ -45,8 +45,6 @@ class OslShaderGeneratorTester : public GenShaderUtil::ShaderGeneratorTester
 
     void addSkipFiles() override
     {
-        _skipFiles.insert("hair_bsdf.mtlx");
-        _skipFiles.insert("hair_surfaceshader.mtlx");
     }
 
     // Ignore light shaders in the document for OSL