From 5970454587a90d6f767cf9476f963bd0955f0f8b Mon Sep 17 00:00:00 2001 From: Niklas Harrysson Date: Thu, 29 Sep 2022 20:29:15 +0200 Subject: [PATCH 1/4] Cleanup add and multiply operators for shader types --- .../stdlib/genglsl/mx_add_surfaceshader.glsl | 5 - .../mx_multiply_surfaceshader_color3.glsl | 5 - .../mx_multiply_surfaceshader_float.glsl | 5 - .../stdlib/genglsl/stdlib_genglsl_impl.mtlx | 3 - .../stdlib/genmdl/stdlib_genmdl_impl.mtlx | 3 - .../stdlib/genosl/stdlib_genosl_impl.mtlx | 3 - libraries/stdlib/stdlib_defs.mtlx | 45 --------- resources/Materials/TestSuite/_options.mtlx | 2 +- .../pbrlib/surfaceshader/shader_ops.mtlx | 14 +-- .../MaterialXGenMdl/mdl/materialx/stdlib.mdl | 99 ------------------- 10 files changed, 2 insertions(+), 182 deletions(-) delete mode 100644 libraries/stdlib/genglsl/mx_add_surfaceshader.glsl delete mode 100644 libraries/stdlib/genglsl/mx_multiply_surfaceshader_color3.glsl delete mode 100644 libraries/stdlib/genglsl/mx_multiply_surfaceshader_float.glsl diff --git a/libraries/stdlib/genglsl/mx_add_surfaceshader.glsl b/libraries/stdlib/genglsl/mx_add_surfaceshader.glsl deleted file mode 100644 index bb60c7126d..0000000000 --- a/libraries/stdlib/genglsl/mx_add_surfaceshader.glsl +++ /dev/null @@ -1,5 +0,0 @@ -void mx_add_surfaceshader(surfaceshader shader1, surfaceshader shader2, out surfaceshader returnshader) -{ - returnshader.color = shader1.color + shader2.color; - returnshader.transparency = shader1.transparency + shader2.transparency; -} diff --git a/libraries/stdlib/genglsl/mx_multiply_surfaceshader_color3.glsl b/libraries/stdlib/genglsl/mx_multiply_surfaceshader_color3.glsl deleted file mode 100644 index dfdb041321..0000000000 --- a/libraries/stdlib/genglsl/mx_multiply_surfaceshader_color3.glsl +++ /dev/null @@ -1,5 +0,0 @@ -void mx_multiply_surfaceshader_color3(surfaceshader shader1, vec3 value, out surfaceshader returnshader) -{ - returnshader.color = shader1.color * value; - returnshader.transparency = shader1.transparency; -} diff --git a/libraries/stdlib/genglsl/mx_multiply_surfaceshader_float.glsl b/libraries/stdlib/genglsl/mx_multiply_surfaceshader_float.glsl deleted file mode 100644 index 198b1a10d5..0000000000 --- a/libraries/stdlib/genglsl/mx_multiply_surfaceshader_float.glsl +++ /dev/null @@ -1,5 +0,0 @@ -void mx_multiply_surfaceshader_float(surfaceshader shader1, float value, out surfaceshader returnshader) -{ - returnshader.color = shader1.color * vec3(value); - returnshader.transparency = shader1.transparency * value; -} diff --git a/libraries/stdlib/genglsl/stdlib_genglsl_impl.mtlx b/libraries/stdlib/genglsl/stdlib_genglsl_impl.mtlx index 39262ae95a..bba7de8a46 100644 --- a/libraries/stdlib/genglsl/stdlib_genglsl_impl.mtlx +++ b/libraries/stdlib/genglsl/stdlib_genglsl_impl.mtlx @@ -222,7 +222,6 @@ - @@ -255,8 +254,6 @@ - - diff --git a/libraries/stdlib/genmdl/stdlib_genmdl_impl.mtlx b/libraries/stdlib/genmdl/stdlib_genmdl_impl.mtlx index 24b5099ad2..1f809e6c25 100644 --- a/libraries/stdlib/genmdl/stdlib_genmdl_impl.mtlx +++ b/libraries/stdlib/genmdl/stdlib_genmdl_impl.mtlx @@ -224,7 +224,6 @@ - @@ -257,8 +256,6 @@ - - diff --git a/libraries/stdlib/genosl/stdlib_genosl_impl.mtlx b/libraries/stdlib/genosl/stdlib_genosl_impl.mtlx index 1677aecc1c..9bbb54e308 100644 --- a/libraries/stdlib/genosl/stdlib_genosl_impl.mtlx +++ b/libraries/stdlib/genosl/stdlib_genosl_impl.mtlx @@ -225,7 +225,6 @@ - @@ -258,8 +257,6 @@ - - diff --git a/libraries/stdlib/stdlib_defs.mtlx b/libraries/stdlib/stdlib_defs.mtlx index 000344868c..572984eb28 100644 --- a/libraries/stdlib/stdlib_defs.mtlx +++ b/libraries/stdlib/stdlib_defs.mtlx @@ -1185,21 +1185,6 @@ - - - - - - - - - - - - - - - @@ -1386,36 +1371,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/resources/Materials/TestSuite/pbrlib/surfaceshader/shader_ops.mtlx b/resources/Materials/TestSuite/pbrlib/surfaceshader/shader_ops.mtlx index c4fa986647..ad82daa8a9 100644 --- a/resources/Materials/TestSuite/pbrlib/surfaceshader/shader_ops.mtlx +++ b/resources/Materials/TestSuite/pbrlib/surfaceshader/shader_ops.mtlx @@ -1,18 +1,6 @@ - - - - - - - - - - - - @@ -24,6 +12,6 @@ - + diff --git a/source/MaterialXGenMdl/mdl/materialx/stdlib.mdl b/source/MaterialXGenMdl/mdl/materialx/stdlib.mdl index 1e4db85eed..09c3065437 100644 --- a/source/MaterialXGenMdl/mdl/materialx/stdlib.mdl +++ b/source/MaterialXGenMdl/mdl/materialx/stdlib.mdl @@ -1322,105 +1322,6 @@ export float mx_time_float( return ::state::animation_time(); } -export material mx_add_surfaceshader( - material mxp_in1, - material mxp_in2 [[ anno::unused() ]] -) - [[ - anno::description("Node Group: math") - ]] -= mxp_in1; // TODO - -export material mx_add_displacementshader( - material mxp_in1, - material mxp_in2 [[ anno::unused() ]] -) - [[ - anno::description("Node Group: math") - ]] -= mxp_in1; // TODO - -export material mx_add_volumeshader( - material mxp_in1, - material mxp_in2 [[ anno::unused() ]] -) - [[ - anno::description("Node Group: math") - ]] -= mxp_in1; // TODO - -export material mx_multiply_surfaceshaderF( - material mxp_in1, - float mxp_in2 = float(1.0) - [[ - anno::unused() - ]] -) - [[ - anno::description("Node Group: math") - ]] -= mxp_in1; // TODO - -export material mx_multiply_displacementshaderF( - material mxp_in1, - float mxp_in2 = float(1.0) - [[ - anno::unused() - ]] -) - [[ - anno::description("Node Group: math") - ]] -= mxp_in1; // TODO - -export material mx_multiply_volumeshaderF( - material mxp_in1, - float mxp_in2 = float(1.0) - [[ - anno::unused() - ]] -) - [[ - anno::description("Node Group: math") - ]] -= mxp_in1; // TODO - -export material mx_multiply_surfaceshaderC( - material mxp_in1, - color mxp_in2 = color(1.0, 1.0, 1.0) - [[ - anno::unused() - ]] -) - [[ - anno::description("Node Group: math") - ]] -= mxp_in1; // TODO - -export material mx_multiply_volumeshaderC( - material mxp_in1, - color mxp_in2 = color(1.0, 1.0, 1.0) - [[ - anno::unused() - ]] -) - [[ - anno::description("Node Group: math") - ]] -= mxp_in1; // TODO - -export material mx_multiply_displacementshaderV( - material mxp_in1, - float3 mxp_in2 = float3(1.0, 1.0, 1.0) - [[ - anno::unused() - ]] -) - [[ - anno::description("Node Group: math") - ]] -= mxp_in1; // TODO - export color mx_modulo_color3( color mxp_in1 = color(0.0, 0.0, 0.0), color mxp_in2 = color(1.0, 1.0, 1.0) From e4b686f8b2a5df21c97178740e9667a57406b019 Mon Sep 17 00:00:00 2001 From: Niklas Harrysson Date: Fri, 30 Sep 2022 12:26:50 +0200 Subject: [PATCH 2/4] Cleanup test implementation skip list --- source/MaterialXTest/MaterialXGenShader/GenShaderUtil.cpp | 6 ------ 1 file changed, 6 deletions(-) diff --git a/source/MaterialXTest/MaterialXGenShader/GenShaderUtil.cpp b/source/MaterialXTest/MaterialXGenShader/GenShaderUtil.cpp index c1e6769750..7f2f9c9f08 100644 --- a/source/MaterialXTest/MaterialXGenShader/GenShaderUtil.cpp +++ b/source/MaterialXTest/MaterialXGenShader/GenShaderUtil.cpp @@ -109,13 +109,7 @@ void checkImplementations(mx::GenContext& context, // Explicit set of node defs to skip temporarily mx::StringSet skipNodeDefs = { - "ND_add_displacementshader", - "ND_add_volumeshader", "ND_add_vdf", - "ND_multiply_displacementshaderF", - "ND_multiply_displacementshaderV", - "ND_multiply_volumeshaderF", - "ND_multiply_volumeshaderC", "ND_multiply_vdfF", "ND_multiply_vdfC", "ND_mix_displacementshader", From c079dfdcbdeeb1522d9d15a5111528190d7e31ae Mon Sep 17 00:00:00 2001 From: Niklas Harrysson Date: Fri, 30 Sep 2022 13:33:18 +0200 Subject: [PATCH 3/4] Update implementation skip count in testsuite --- source/MaterialXTest/MaterialXGenGlsl/GenGlsl.cpp | 2 +- source/MaterialXTest/MaterialXGenMdl/GenMdl.cpp | 2 +- source/MaterialXTest/MaterialXGenOsl/GenOsl.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source/MaterialXTest/MaterialXGenGlsl/GenGlsl.cpp b/source/MaterialXTest/MaterialXGenGlsl/GenGlsl.cpp index bd40e1bd70..8033378533 100644 --- a/source/MaterialXTest/MaterialXGenGlsl/GenGlsl.cpp +++ b/source/MaterialXTest/MaterialXGenGlsl/GenGlsl.cpp @@ -85,7 +85,7 @@ TEST_CASE("GenShader: GLSL Implementation Check", "[genglsl]") mx::StringSet generatorSkipNodeTypes; mx::StringSet generatorSkipNodeDefs; - GenShaderUtil::checkImplementations(context, generatorSkipNodeTypes, generatorSkipNodeDefs, 54); + GenShaderUtil::checkImplementations(context, generatorSkipNodeTypes, generatorSkipNodeDefs, 48); } TEST_CASE("GenShader: GLSL Unique Names", "[genglsl]") diff --git a/source/MaterialXTest/MaterialXGenMdl/GenMdl.cpp b/source/MaterialXTest/MaterialXGenMdl/GenMdl.cpp index 6b9f814bb5..92d4bab534 100644 --- a/source/MaterialXTest/MaterialXGenMdl/GenMdl.cpp +++ b/source/MaterialXTest/MaterialXGenMdl/GenMdl.cpp @@ -92,7 +92,7 @@ TEST_CASE("GenShader: MDL Implementation Check", "[genmdl]") generatorSkipNodeTypes.insert("light"); mx::StringSet generatorSkipNodeDefs; - GenShaderUtil::checkImplementations(context, generatorSkipNodeTypes, generatorSkipNodeDefs, 55); + GenShaderUtil::checkImplementations(context, generatorSkipNodeTypes, generatorSkipNodeDefs, 49); } void MdlShaderGeneratorTester::compileSource(const std::vector& sourceCodePaths) diff --git a/source/MaterialXTest/MaterialXGenOsl/GenOsl.cpp b/source/MaterialXTest/MaterialXGenOsl/GenOsl.cpp index 37e8d57adf..70738bfb2c 100644 --- a/source/MaterialXTest/MaterialXGenOsl/GenOsl.cpp +++ b/source/MaterialXTest/MaterialXGenOsl/GenOsl.cpp @@ -89,7 +89,7 @@ TEST_CASE("GenShader: OSL Implementation Check", "[genosl]") generatorSkipNodeTypes.insert("light"); mx::StringSet generatorSkipNodeDefs; - GenShaderUtil::checkImplementations(context, generatorSkipNodeTypes, generatorSkipNodeDefs, 55); + GenShaderUtil::checkImplementations(context, generatorSkipNodeTypes, generatorSkipNodeDefs, 49); } TEST_CASE("GenShader: OSL Unique Names", "[genosl]") From 98158346ae3d5fcd2c53e81daab8299d568e1177 Mon Sep 17 00:00:00 2001 From: Niklas Harrysson Date: Fri, 30 Sep 2022 14:02:55 +0200 Subject: [PATCH 4/4] Revert change to testsuite options file --- resources/Materials/TestSuite/_options.mtlx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/Materials/TestSuite/_options.mtlx b/resources/Materials/TestSuite/_options.mtlx index c705effd5b..3ebf410ade 100644 --- a/resources/Materials/TestSuite/_options.mtlx +++ b/resources/Materials/TestSuite/_options.mtlx @@ -31,7 +31,7 @@ - +