Harmonize MSL and GLSL implementations (AcademySoftwareFoundation#2070)

This changelist addresses a handful of remaining cases where our MSL and GLSL code diverged, harmonizing on shading code that works in both contexts.
wetadigital · Oct 15, 2024 · 8af07e1 · 8af07e1
1 parent da60312
commit 8af07e1
Show file tree

Hide file tree

Showing 14 changed files with 22 additions and 113 deletions.
diff --git a/libraries/stdlib/genglsl/mx_burn_color3.glsl b/libraries/stdlib/genglsl/mx_burn_color3.glsl
@@ -2,7 +2,8 @@
 
 void mx_burn_color3(vec3 fg, vec3 bg, float mixval, out vec3 result)
 {
-    mx_burn_float(fg.x, bg.x, mixval, result.x);
-    mx_burn_float(fg.y, bg.y, mixval, result.y);
-    mx_burn_float(fg.z, bg.z, mixval, result.z);
+    float f;
+    mx_burn_float(fg.x, bg.x, mixval, f); result.x = f;
+    mx_burn_float(fg.y, bg.y, mixval, f); result.y = f;
+    mx_burn_float(fg.z, bg.z, mixval, f); result.z = f;
 }
diff --git a/libraries/stdlib/genglsl/mx_burn_color4.glsl b/libraries/stdlib/genglsl/mx_burn_color4.glsl
@@ -2,8 +2,9 @@
 
 void mx_burn_color4(vec4 fg, vec4 bg, float mixval, out vec4 result)
 {
-    mx_burn_float(fg.x, bg.x, mixval, result.x);
-    mx_burn_float(fg.y, bg.y, mixval, result.y);
-    mx_burn_float(fg.z, bg.z, mixval, result.z);
-    mx_burn_float(fg.w, bg.w, mixval, result.w);
+    float f;
+    mx_burn_float(fg.x, bg.x, mixval, f); result.x = f;
+    mx_burn_float(fg.y, bg.y, mixval, f); result.y = f;
+    mx_burn_float(fg.z, bg.z, mixval, f); result.z = f;
+    mx_burn_float(fg.w, bg.w, mixval, f); result.w = f;
 }
diff --git a/libraries/stdlib/genglsl/mx_dodge_color3.glsl b/libraries/stdlib/genglsl/mx_dodge_color3.glsl
@@ -2,7 +2,8 @@
 
 void mx_dodge_color3(vec3 fg, vec3 bg, float mixval, out vec3 result)
 {
-    mx_dodge_float(fg.x, bg.x, mixval, result.x);
-    mx_dodge_float(fg.y, bg.y, mixval, result.y);
-    mx_dodge_float(fg.z, bg.z, mixval, result.z);
+    float f;
+    mx_dodge_float(fg.x, bg.x, mixval, f); result.x = f;
+    mx_dodge_float(fg.y, bg.y, mixval, f); result.y = f;
+    mx_dodge_float(fg.z, bg.z, mixval, f); result.z = f;
 }
diff --git a/libraries/stdlib/genglsl/mx_dodge_color4.glsl b/libraries/stdlib/genglsl/mx_dodge_color4.glsl
@@ -2,8 +2,9 @@
 
 void mx_dodge_color4(vec4 fg , vec4 bg , float mixval, out vec4 result)
 {
-    mx_dodge_float(fg.x, bg.x, mixval, result.x);
-    mx_dodge_float(fg.y, bg.y, mixval, result.y);
-    mx_dodge_float(fg.z, bg.z, mixval, result.z);
-    mx_dodge_float(fg.w, bg.w, mixval, result.w);
+    float f;
+    mx_dodge_float(fg.x, bg.x, mixval, f); result.x = f;
+    mx_dodge_float(fg.y, bg.y, mixval, f); result.y = f;
+    mx_dodge_float(fg.z, bg.z, mixval, f); result.z = f;
+    mx_dodge_float(fg.w, bg.w, mixval, f); result.w = f;
 }
diff --git a/libraries/stdlib/genglsl/mx_normalmap.glsl b/libraries/stdlib/genglsl/mx_normalmap.glsl
@@ -1,9 +1,9 @@
 void mx_normalmap_vector2(vec3 value, vec2 normal_scale, vec3 N, vec3 T, vec3 B, out vec3 result)
 {
-    value = (value == vec3(0.0)) ? vec3(0.0, 0.0, 1.0) : value * 2.0 - 1.0;
-
-    value = T * value.x * normal_scale.x + B * value.y * normal_scale.y + N * value.z;
-
+    value = (dot(value, value) == 0.0) ? vec3(0.0, 0.0, 1.0) : value * 2.0 - 1.0;
+    value = T * value.x * normal_scale.x +
+            B * value.y * normal_scale.y +
+            N * value.z;
     result = normalize(value);
 }
 

diff --git a/libraries/stdlib/genmsl/mx_burn_color3.metal b/libraries/stdlib/genmsl/mx_burn_color3.metal
diff --git a/libraries/stdlib/genmsl/mx_burn_color4.metal b/libraries/stdlib/genmsl/mx_burn_color4.metal
diff --git a/libraries/stdlib/genmsl/mx_burn_float.metal b/libraries/stdlib/genmsl/mx_burn_float.metal
diff --git a/libraries/stdlib/genmsl/mx_dodge_color3.metal b/libraries/stdlib/genmsl/mx_dodge_color3.metal
diff --git a/libraries/stdlib/genmsl/mx_dodge_color4.metal b/libraries/stdlib/genmsl/mx_dodge_color4.metal
diff --git a/libraries/stdlib/genmsl/mx_dodge_float.metal b/libraries/stdlib/genmsl/mx_dodge_float.metal
diff --git a/libraries/stdlib/genmsl/mx_normalmap.metal b/libraries/stdlib/genmsl/mx_normalmap.metal
diff --git a/libraries/stdlib/genmsl/mx_smoothstep_float.metal b/libraries/stdlib/genmsl/mx_smoothstep_float.metal
diff --git a/libraries/stdlib/genmsl/stdlib_genmsl_impl.mtlx b/libraries/stdlib/genmsl/stdlib_genmsl_impl.mtlx
@@ -41,10 +41,6 @@
     <input name="default" type="vector4" implname="default_value" />
   </implementation>
 
-  <!-- <normalmap> -->
-  <implementation name="IM_normalmap_float_genmsl" nodedef="ND_normalmap_float" file="mx_normalmap.metal" function="mx_normalmap_float" target="genmsl" />
-  <implementation name="IM_normalmap_vector2_genmsl" nodedef="ND_normalmap_vector2" file="mx_normalmap.metal" function="mx_normalmap_vector2" target="genmsl" />
-
   <!-- ======================================================================== -->
   <!-- Procedural nodes                                                         -->
   <!-- ======================================================================== -->
@@ -134,23 +130,10 @@
   <!-- Adjustment nodes                                                         -->
   <!-- ======================================================================== -->
 
-  <!-- <smoothstep> -->
-  <implementation name="IM_smoothstep_float_genmsl" nodedef="ND_smoothstep_float" file="mx_smoothstep_float.metal" function="mx_smoothstep_float" target="genmsl" />
-
   <!-- ======================================================================== -->
   <!-- Compositing nodes                                                        -->
   <!-- ======================================================================== -->
 
-  <!-- <burn> -->
-  <implementation name="IM_burn_float_genmsl" nodedef="ND_burn_float" file="mx_burn_float.metal" function="mx_burn_float" target="genmsl" />
-  <implementation name="IM_burn_color3_genmsl" nodedef="ND_burn_color3" file="mx_burn_color3.metal" function="mx_burn_color3" target="genmsl" />
-  <implementation name="IM_burn_color4_genmsl" nodedef="ND_burn_color4" file="mx_burn_color4.metal" function="mx_burn_color4" target="genmsl" />
-
-  <!-- <dodge> -->
-  <implementation name="IM_dodge_float_genmsl" nodedef="ND_dodge_float" file="mx_dodge_float.metal" function="mx_dodge_float" target="genmsl" />
-  <implementation name="IM_dodge_color3_genmsl" nodedef="ND_dodge_color3" file="mx_dodge_color3.metal" function="mx_dodge_color3" target="genmsl" />
-  <implementation name="IM_dodge_color4_genmsl" nodedef="ND_dodge_color4" file="mx_dodge_color4.metal" function="mx_dodge_color4" target="genmsl" />
-
   <!-- ======================================================================== -->
   <!-- Conditional nodes                                                        -->
   <!-- ======================================================================== -->