Merge branch 'AcademySoftwareFoundation:main' into PR-fix-3-way-test-…

…compare

libraries/stdlib/genglsl/stdlib_genglsl_impl.mtlx

@@ -488,9 +488,6 @@
 
   <!-- <smoothstep> -->
   <implementation name="IM_smoothstep_float_genglsl" nodedef="ND_smoothstep_float" file="mx_smoothstep_float.glsl" function="mx_smoothstep_float" target="genglsl" />
-  <implementation name="IM_smoothstep_vector2_genglsl" nodedef="ND_smoothstep_vector2" file="mx_smoothstep_vector2.glsl" function="mx_smoothstep_vector2" target="genglsl" />
-  <implementation name="IM_smoothstep_vector3_genglsl" nodedef="ND_smoothstep_vector3" file="mx_smoothstep_vector3.glsl" function="mx_smoothstep_vector3" target="genglsl" />
-  <implementation name="IM_smoothstep_vector4_genglsl" nodedef="ND_smoothstep_vector4" file="mx_smoothstep_vector4.glsl" function="mx_smoothstep_vector4" target="genglsl" />
 
   <!-- <luminance> -->
   <implementation name="IM_luminance_color3_genglsl" nodedef="ND_luminance_color3" file="mx_luminance_color3.glsl" function="mx_luminance_color3" target="genglsl" />

libraries/stdlib/genmsl/stdlib_genmsl_impl.mtlx

@@ -489,9 +489,6 @@
 
   <!-- <smoothstep> -->
   <implementation name="IM_smoothstep_float_genmsl" nodedef="ND_smoothstep_float" file="mx_smoothstep_float.metal" function="mx_smoothstep_float" target="genmsl" />
-  <implementation name="IM_smoothstep_vector2_genmsl" nodedef="ND_smoothstep_vector2" file="mx_smoothstep_vector2.metal" function="mx_smoothstep_vector2" target="genmsl" />
-  <implementation name="IM_smoothstep_vector3_genmsl" nodedef="ND_smoothstep_vector3" file="mx_smoothstep_vector3.metal" function="mx_smoothstep_vector3" target="genmsl" />
-  <implementation name="IM_smoothstep_vector4_genmsl" nodedef="ND_smoothstep_vector4" file="mx_smoothstep_vector4.metal" function="mx_smoothstep_vector4" target="genmsl" />
 
   <!-- <luminance> -->
   <implementation name="IM_luminance_color3_genmsl" nodedef="ND_luminance_color3" file="../genglsl/mx_luminance_color3.glsl" function="mx_luminance_color3" target="genmsl" />

resources/Materials/TestSuite/stdlib/adjustment/smoothstep.mtlx

@@ -4,21 +4,56 @@
     Basic adjustment function tests each test is in a separate graph for each variation in input type.
     - smoothstep
   -->
-  <nodegraph name="smoothstep_float_range_min">
-    <smoothstep name="smoothstep1" type="float">
-      <input name="in" type="float" value="0.2000" />
-      <input name="low" type="float" value="0.2000" />
-      <input name="high" type="float" value="0.8000" />
+  <nodegraph name="smoothstep_float">
+    <texcoord name="texcoord" type="vector2" />
+    <extract name="extract" type="float">
+      <input name="in" type="vector2" nodename="texcoord" />
+      <input name="index" type="integer" value="0" />
+    </extract>
+    <smoothstep name="smoothstep" type="float">
+      <input name="in" type="float" nodename="extract" />
+      <input name="low" type="float" value="0.2" />
+      <input name="high" type="float" value="0.8" />
     </smoothstep>
-    <output name="out" type="float" nodename="smoothstep1" />
+    <output name="out" type="float" nodename="smoothstep" />
   </nodegraph>
-  <nodegraph name="smoothstep_float_range_max">
-    <smoothstep name="smoothstep1" type="float">
-      <input name="in" type="float" value="0.8000" />
-      <input name="low" type="float" value="0.2000" />
-      <input name="high" type="float" value="0.8000" />
+  <nodegraph name="smoothstep_vector3">
+    <normal name="normal" type="vector3" />
+    <absval name="absval" type="vector3">
+      <input name="in" type="vector3" nodename="normal" />
+    </absval>
+    <smoothstep name="smoothstep" type="vector3">
+      <input name="in" type="vector3" nodename="absval" />
+      <input name="low" type="vector3" value="0.2, 0.2, 0.2" />
+      <input name="high" type="vector3" value="0.8, 0.8, 0.8" />
+    </smoothstep>
+    <output name="out" type="vector3" nodename="smoothstep" />
+  </nodegraph>
+  <nodegraph name="smoothstep_multi">
+    <texcoord name="texcoord" type="vector2" />
+    <extract name="extract" type="float">
+      <input name="in" type="vector2" nodename="texcoord" />
+      <input name="index" type="integer" value="0" />
+    </extract>
+    <normal name="normal" type="vector3" />
+    <absval name="absval" type="vector3">
+      <input name="in" type="vector3" nodename="normal" />
+    </absval>
+    <smoothstep name="smoothstep1" type="vector3">
+      <input name="in" type="vector3" nodename="absval" />
+      <input name="low" type="vector3" value="0.2, 0.2, 0.2" />
+      <input name="high" type="vector3" value="0.8, 0.8, 0.8" />
+    </smoothstep>
+    <smoothstep name="smoothstep2" type="float">
+      <input name="in" type="float" nodename="extract" />
+      <input name="low" type="float" value="0.2" />
+      <input name="high" type="float" value="0.8" />
     </smoothstep>
-    <output name="out" type="float" nodename="smoothstep1" />
+    <multiply name="multiply" type="vector3">
+      <input name="in1" type="vector3" nodename="smoothstep1" />
+      <input name="in2" type="float" nodename="smoothstep2" />
+    </multiply>
+    <output name="out" type="vector3" nodename="multiply" />
   </nodegraph>
   <nodegraph name="smoothstep_vector2">
     <smoothstep name="smoothstep1" type="vector2">
@@ -28,14 +63,6 @@
     </smoothstep>
     <output name="out" type="vector2" nodename="smoothstep1" />
   </nodegraph>
-  <nodegraph name="smoothstep_vector3">
-    <smoothstep name="smoothstep1" type="vector3">
-      <input name="in" type="vector3" value="0.6000, 0.5000, 0.2000" />
-      <input name="low" type="vector3" value="0.2000, 0.2000, 0.0" />
-      <input name="high" type="vector3" value="0.8000, 0.8000, 1.0" />
-    </smoothstep>
-    <output name="out" type="vector3" nodename="smoothstep1" />
-  </nodegraph>
   <nodegraph name="smoothstep_vector4">
     <smoothstep name="smoothstep1" type="vector4">
       <input name="in" type="vector4" value="0.6000, 0.5000, 0.2000, 1.0" />