LOOKDEVX-0000 - Fix legacy CM nodes affected by MaterialX 1.38.8

lib/mayaUsd/render/MaterialXGenOgsXml/CMakeLists.txt

@@ -58,6 +58,15 @@ list(APPEND NODE_GLSL_IMPLEMENTATIONS_VERSIONED
     libraries/mx_srgb_texture_to_linrec2020_color4.glsl
 )
 
+list(APPEND NODE_GLSL_LIB_VERSIONED
+    libraries/usd_transform_color.glsl
+)
+
+list(APPEND NODE_GLSL_EXTRA_IMPLEMENTATIONS_VERSIONED
+    libraries/mx_srgb_texture_to_lin_rec709_color3.glsl
+    libraries/mx_srgb_texture_to_lin_rec709_color4.glsl
+)
+
 # -----------------------------------------------------------------------------
 # promote headers
 # -----------------------------------------------------------------------------
@@ -95,9 +104,12 @@ if(MaterialX_VERSION VERSION_LESS "1.38.4")
     endforeach()
 elseif(MaterialX_VERSION VERSION_LESS "1.38.8")
     MESSAGE(STATUS "Using 1.38.[4-7] libraries with MaterialX ${MaterialX_VERSION}")
-    install(FILES ${NODE_GLSL_IMPLEMENTATIONS_VERSIONED}
-        DESTINATION ${CMAKE_INSTALL_PREFIX}/libraries/adsk/maya/genglsl
-    )
+    foreach(MTLX_FILE ${NODE_GLSL_IMPLEMENTATIONS_VERSIONED})
+        string(REPLACE "libraries/" "libraries/1.38.7/" MTLX_FILE ${MTLX_FILE})
+        install(FILES "${MTLX_FILE}"
+            DESTINATION ${CMAKE_INSTALL_PREFIX}/libraries/adsk/maya/genglsl
+        )
+    endforeach()
     foreach(MTLX_FILE ${LIGHT_IMPLEMENTATIONS})
         string(REPLACE "libraries/" "libraries/1.38.7/" MTLX_FILE ${MTLX_FILE})
         install(FILES "${MTLX_FILE}"
@@ -109,6 +121,12 @@ else()
     install(FILES ${NODE_GLSL_IMPLEMENTATIONS_VERSIONED}
         DESTINATION ${CMAKE_INSTALL_PREFIX}/libraries/adsk/maya/genglsl
     )
+    install(FILES ${NODE_GLSL_EXTRA_IMPLEMENTATIONS_VERSIONED}
+        DESTINATION ${CMAKE_INSTALL_PREFIX}/libraries/adsk/maya/genglsl
+    )
+    install(FILES ${NODE_GLSL_LIB_VERSIONED}
+        DESTINATION ${CMAKE_INSTALL_PREFIX}/libraries/adsk/maya/genglsl/lib
+    )
     install(FILES ${LIGHT_IMPLEMENTATIONS}
         DESTINATION ${CMAKE_INSTALL_PREFIX}/libraries/pbrlib/genglsl/ogsxml
     )

lib/mayaUsd/render/MaterialXGenOgsXml/libraries/1.38.7/mx_srgb_texture_to_aces_2065_1_color3.glsl

@@ -0,0 +1,11 @@
+#include "libraries/stdlib/genglsl/lib/mx_transform_color.glsl"
+
+void mx_srgb_texture_to_aces_2065_1_color3(vec3 _in, out vec3 result)
+{
+    result = mx_srgb_texture_to_lin_rec709(_in);
+
+    // Same matrix as found in ../../vp2ShaderFragments/shaderFragments.cpp
+    result = mat3(0.43963298, 0.08977644, 0.01754117,
+                  0.38298870, 0.81343943, 0.11154655,
+                  0.17737832, 0.09678413, 0.87091228) * result;
+}

lib/mayaUsd/render/MaterialXGenOgsXml/libraries/1.38.7/mx_srgb_texture_to_aces_2065_1_color4.glsl

@@ -0,0 +1,13 @@
+#include "libraries/stdlib/genglsl/lib/mx_transform_color.glsl"
+
+void mx_srgb_texture_to_aces_2065_1_color4(vec4 _in, out vec4 result)
+{
+    vec3 color = mx_srgb_texture_to_lin_rec709(_in.rgb);
+
+    // Same matrix as found in ../../vp2ShaderFragments/shaderFragments.cpp
+    color = mat3(0.43963298, 0.08977644, 0.01754117,
+                 0.38298870, 0.81343943, 0.11154655,
+                 0.17737832, 0.09678413, 0.87091228) * color;
+
+    result = vec4(color, _in.a);
+}

lib/mayaUsd/render/MaterialXGenOgsXml/libraries/1.38.7/mx_srgb_texture_to_acescg_color3.glsl

@@ -0,0 +1,11 @@
+#include "libraries/stdlib/genglsl/lib/mx_transform_color.glsl"
+
+void mx_srgb_texture_to_acescg_color3(vec3 _in, out vec3 result)
+{
+    result = mx_srgb_texture_to_lin_rec709(_in);
+
+    // Same matrix as found in ../../vp2ShaderFragments/shaderFragments.cpp
+    result = mat3(0.61309740, 0.07019372, 0.02061559,
+                  0.33952315, 0.91635388, 0.10956977,
+                  0.04737945, 0.01345240, 0.86981463) * result;
+}

lib/mayaUsd/render/MaterialXGenOgsXml/libraries/1.38.7/mx_srgb_texture_to_acescg_color4.glsl

@@ -0,0 +1,13 @@
+#include "libraries/stdlib/genglsl/lib/mx_transform_color.glsl"
+
+void mx_srgb_texture_to_acescg_color4(vec4 _in, out vec4 result)
+{
+    vec3 color = mx_srgb_texture_to_lin_rec709(_in.rgb);
+
+    // Same matrix as found in ../../vp2ShaderFragments/shaderFragments.cpp
+    color = mat3(0.61309740, 0.07019372, 0.02061559,
+                 0.33952315, 0.91635388, 0.10956977,
+                 0.04737945, 0.01345240, 0.86981463) * color;
+
+    result = vec4(color, _in.a);
+}

lib/mayaUsd/render/MaterialXGenOgsXml/libraries/1.38.7/mx_srgb_texture_to_lin_dci_p3_d65_color3.glsl

@@ -0,0 +1,11 @@
+#include "libraries/stdlib/genglsl/lib/mx_transform_color.glsl"
+
+void mx_srgb_texture_to_lin_dci_p3_d65_color3(vec3 _in, out vec3 result)
+{
+    result = mx_srgb_texture_to_lin_rec709(_in);
+
+    // Same matrix as found in ../../vp2ShaderFragments/shaderFragments.cpp
+    result = mat3(0.82246197, 0.03319420, 0.01708263,
+                  0.17753803, 0.96680580, 0.07239744,
+                  0.,         0.,         0.91051993) * result;
+}

lib/mayaUsd/render/MaterialXGenOgsXml/libraries/1.38.7/mx_srgb_texture_to_lin_dci_p3_d65_color4.glsl

@@ -0,0 +1,13 @@
+#include "libraries/stdlib/genglsl/lib/mx_transform_color.glsl"
+
+void mx_srgb_texture_to_lin_dci_p3_d65_color4(vec4 _in, out vec4 result)
+{
+    vec3 color = mx_srgb_texture_to_lin_rec709(_in.rgb);
+
+    // Same matrix as found in ../../vp2ShaderFragments/shaderFragments.cpp
+    color = mat3(0.82246197, 0.03319420, 0.01708263,
+                 0.17753803, 0.96680580, 0.07239744,
+                 0.,         0.,         0.91051993) * color;
+
+    result = vec4(color, _in.a);
+}

lib/mayaUsd/render/MaterialXGenOgsXml/libraries/1.38.7/mx_srgb_texture_to_linrec2020_color3.glsl

@@ -0,0 +1,11 @@
+#include "libraries/stdlib/genglsl/lib/mx_transform_color.glsl"
+
+void mx_srgb_texture_to_linrec2020_color3(vec3 _in, out vec3 result)
+{
+    result = mx_srgb_texture_to_lin_rec709(_in);
+
+    // Same matrix as found in ../../vp2ShaderFragments/shaderFragments.cpp
+    result = mat3(0.62740389, 0.06909729, 0.01639144,
+                  0.32928304, 0.91954039, 0.08801331,
+                  0.04331307, 0.01136232, 0.89559525) * result;
+}

lib/mayaUsd/render/MaterialXGenOgsXml/libraries/1.38.7/mx_srgb_texture_to_linrec2020_color4.glsl

@@ -0,0 +1,13 @@
+#include "libraries/stdlib/genglsl/lib/mx_transform_color.glsl"
+
+void mx_srgb_texture_to_linrec2020_color4(vec4 _in, out vec4 result)
+{
+    vec3 color = mx_srgb_texture_to_lin_rec709(_in.rgb);
+
+    // Same matrix as found in ../../vp2ShaderFragments/shaderFragments.cpp
+    color = mat3(0.62740389, 0.06909729, 0.01639144,
+                 0.32928304, 0.91954039, 0.08801331,
+                 0.04331307, 0.01136232, 0.89559525) * color;
+
+    result = vec4(color, _in.a);
+}

lib/mayaUsd/render/MaterialXGenOgsXml/libraries/1.38.7/usd_utilities_genglsl_impl.mtlx

@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<materialx version="1.38">
+  <!--
+ Copyright 2022 Autodesk
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+  -->
+  <implementation name="MayaIM_texcoordtangents_vector3_genglsl" nodedef="MayaND_texcoordtangents_vector3" file="libraries/adsk/maya/genglsl/mx_texcoordtangents_vector3.glsl" function="mx_texcoordtangents_vector3" target="genglsl" />
+  <implementation name="MayaIM_arbitrarytangents_vector3_genglsl" nodedef="MayaND_arbitrarytangents_vector3" file="libraries/adsk/maya/genglsl/mx_arbitrarytangents_vector3.glsl" function="mx_arbitrarytangents_vector3" target="genglsl" />
+
+  <implementation name="MayaIM_sRGBtoLinrec709_color3_genglsl" nodedef="MayaND_sRGBtoLinrec709_color3" file="libraries/stdlib/genglsl/mx_srgb_texture_to_lin_rec709_color3.glsl" function="mx_srgb_texture_to_lin_rec709_color3" target="genglsl" />
+  <implementation name="MayaIM_sRGBtoLinrec709_color4_genglsl" nodedef="MayaND_sRGBtoLinrec709_color4" file="libraries/stdlib/genglsl/mx_srgb_texture_to_lin_rec709_color4.glsl" function="mx_srgb_texture_to_lin_rec709_color4" target="genglsl" />
+  <implementation name="MayaIM_sRGBtoACEScg_color3_genglsl" nodedef="MayaND_sRGBtoACEScg_color3" file="libraries/adsk/maya/genglsl/mx_srgb_texture_to_acescg_color3.glsl" function="mx_srgb_texture_to_acescg_color3" target="genglsl" />
+  <implementation name="MayaIM_sRGBtoACEScg_color4_genglsl" nodedef="MayaND_sRGBtoACEScg_color4" file="libraries/adsk/maya/genglsl/mx_srgb_texture_to_acescg_color4.glsl" function="mx_srgb_texture_to_acescg_color4" target="genglsl" />
+  <implementation name="MayaIM_sRGBtoACES2065_color3_genglsl" nodedef="MayaND_sRGBtoACES2065_color3" file="libraries/adsk/maya/genglsl/mx_srgb_texture_to_aces_2065_1_color3.glsl" function="mx_srgb_texture_to_aces_2065_1_color3" target="genglsl" />
+  <implementation name="MayaIM_sRGBtoACES2065_color4_genglsl" nodedef="MayaND_sRGBtoACES2065_color4" file="libraries/adsk/maya/genglsl/mx_srgb_texture_to_aces_2065_1_color4.glsl" function="mx_srgb_texture_to_aces_2065_1_color4" target="genglsl" />
+  <implementation name="MayaIM_sRGBtoLinDCIP3D65_color3_genglsl" nodedef="MayaND_sRGBtoLinDCIP3D65_color3" file="libraries/adsk/maya/genglsl/mx_srgb_texture_to_lin_dci_p3_d65_color3.glsl" function="mx_srgb_texture_to_lin_dci_p3_d65_color3" target="genglsl" />
+  <implementation name="MayaIM_sRGBtoLinDCIP3D65_color4_genglsl" nodedef="MayaND_sRGBtoLinDCIP3D65_color4" file="libraries/adsk/maya/genglsl/mx_srgb_texture_to_lin_dci_p3_d65_color4.glsl" function="mx_srgb_texture_to_lin_dci_p3_d65_color4" target="genglsl" />
+  <implementation name="MayaIM_sRGBtoLinrec2020_color3_genglsl" nodedef="MayaND_sRGBtoLinrec2020_color3" file="libraries/adsk/maya/genglsl/mx_srgb_texture_to_linrec2020_color3.glsl" function="mx_srgb_texture_to_linrec2020_color3" target="genglsl" />
+  <implementation name="MayaIM_sRGBtoLinrec2020_color4_genglsl" nodedef="MayaND_sRGBtoLinrec2020_color4" file="libraries/adsk/maya/genglsl/mx_srgb_texture_to_linrec2020_color4.glsl" function="mx_srgb_texture_to_linrec2020_color4" target="genglsl" />
+
+</materialx>

lib/mayaUsd/render/MaterialXGenOgsXml/libraries/mx_srgb_texture_to_aces_2065_1_color3.glsl

@@ -1,8 +1,8 @@
-#include "libraries/stdlib/genglsl/lib/mx_transform_color.glsl"
+#include "libraries/adsk/maya/genglsl/lib/usd_transform_color.glsl"
 
 void mx_srgb_texture_to_aces_2065_1_color3(vec3 _in, out vec3 result)
 {
-    result = mx_srgb_texture_to_lin_rec709(_in);
+    result = usd_srgb_texture_to_lin_rec709(_in);
 
     // Same matrix as found in ../../vp2ShaderFragments/shaderFragments.cpp
     result = mat3(0.43963298, 0.08977644, 0.01754117,

lib/mayaUsd/render/MaterialXGenOgsXml/libraries/mx_srgb_texture_to_aces_2065_1_color4.glsl

@@ -1,8 +1,8 @@
-#include "libraries/stdlib/genglsl/lib/mx_transform_color.glsl"
+#include "libraries/adsk/maya/genglsl/lib/usd_transform_color.glsl"
 
 void mx_srgb_texture_to_aces_2065_1_color4(vec4 _in, out vec4 result)
 {
-    vec3 color = mx_srgb_texture_to_lin_rec709(_in.rgb);
+    vec3 color = usd_srgb_texture_to_lin_rec709(_in.rgb);
 
     // Same matrix as found in ../../vp2ShaderFragments/shaderFragments.cpp
     color = mat3(0.43963298, 0.08977644, 0.01754117,

lib/mayaUsd/render/MaterialXGenOgsXml/libraries/mx_srgb_texture_to_acescg_color3.glsl

@@ -1,8 +1,8 @@
-#include "libraries/stdlib/genglsl/lib/mx_transform_color.glsl"
+#include "libraries/adsk/maya/genglsl/lib/usd_transform_color.glsl"
 
 void mx_srgb_texture_to_acescg_color3(vec3 _in, out vec3 result)
 {
-    result = mx_srgb_texture_to_lin_rec709(_in);
+    result = usd_srgb_texture_to_lin_rec709(_in);
 
     // Same matrix as found in ../../vp2ShaderFragments/shaderFragments.cpp
     result = mat3(0.61309740, 0.07019372, 0.02061559,

lib/mayaUsd/render/MaterialXGenOgsXml/libraries/mx_srgb_texture_to_acescg_color4.glsl

@@ -1,8 +1,8 @@
-#include "libraries/stdlib/genglsl/lib/mx_transform_color.glsl"
+#include "libraries/adsk/maya/genglsl/lib/usd_transform_color.glsl"
 
 void mx_srgb_texture_to_acescg_color4(vec4 _in, out vec4 result)
 {
-    vec3 color = mx_srgb_texture_to_lin_rec709(_in.rgb);
+    vec3 color = usd_srgb_texture_to_lin_rec709(_in.rgb);
 
     // Same matrix as found in ../../vp2ShaderFragments/shaderFragments.cpp
     color = mat3(0.61309740, 0.07019372, 0.02061559,

lib/mayaUsd/render/MaterialXGenOgsXml/libraries/mx_srgb_texture_to_lin_dci_p3_d65_color3.glsl

@@ -1,8 +1,8 @@
-#include "libraries/stdlib/genglsl/lib/mx_transform_color.glsl"
+#include "libraries/adsk/maya/genglsl/lib/usd_transform_color.glsl"
 
 void mx_srgb_texture_to_lin_dci_p3_d65_color3(vec3 _in, out vec3 result)
 {
-    result = mx_srgb_texture_to_lin_rec709(_in);
+    result = usd_srgb_texture_to_lin_rec709(_in);
 
     // Same matrix as found in ../../vp2ShaderFragments/shaderFragments.cpp
     result = mat3(0.82246197, 0.03319420, 0.01708263,

lib/mayaUsd/render/MaterialXGenOgsXml/libraries/mx_srgb_texture_to_lin_dci_p3_d65_color4.glsl

@@ -1,8 +1,8 @@
-#include "libraries/stdlib/genglsl/lib/mx_transform_color.glsl"
+#include "libraries/adsk/maya/genglsl/lib/usd_transform_color.glsl"
 
 void mx_srgb_texture_to_lin_dci_p3_d65_color4(vec4 _in, out vec4 result)
 {
-    vec3 color = mx_srgb_texture_to_lin_rec709(_in.rgb);
+    vec3 color = usd_srgb_texture_to_lin_rec709(_in.rgb);
 
     // Same matrix as found in ../../vp2ShaderFragments/shaderFragments.cpp
     color = mat3(0.82246197, 0.03319420, 0.01708263,

lib/mayaUsd/render/MaterialXGenOgsXml/libraries/mx_srgb_texture_to_lin_rec709_color3.glsl

@@ -0,0 +1,6 @@
+#include "libraries/adsk/maya/genglsl/lib/usd_transform_color.glsl"
+
+void mx_srgb_texture_to_lin_rec709_color3(vec3 _in, out vec3 result)
+{
+    result = usd_srgb_texture_to_lin_rec709(_in);
+}

lib/mayaUsd/render/MaterialXGenOgsXml/libraries/mx_srgb_texture_to_lin_rec709_color4.glsl

@@ -0,0 +1,6 @@
+#include "libraries/adsk/maya/genglsl/lib/usd_transform_color.glsl"
+
+void mx_srgb_texture_to_lin_rec709_color4(vec4 _in, out vec4 result)
+{
+    result = vec4(usd_srgb_texture_to_lin_rec709(_in.rgb), _in.a);
+}

lib/mayaUsd/render/MaterialXGenOgsXml/libraries/mx_srgb_texture_to_linrec2020_color3.glsl

@@ -1,8 +1,8 @@
-#include "libraries/stdlib/genglsl/lib/mx_transform_color.glsl"
+#include "libraries/adsk/maya/genglsl/lib/usd_transform_color.glsl"
 
 void mx_srgb_texture_to_linrec2020_color3(vec3 _in, out vec3 result)
 {
-    result = mx_srgb_texture_to_lin_rec709(_in);
+    result = usd_srgb_texture_to_lin_rec709(_in);
 
     // Same matrix as found in ../../vp2ShaderFragments/shaderFragments.cpp
     result = mat3(0.62740389, 0.06909729, 0.01639144,

lib/mayaUsd/render/MaterialXGenOgsXml/libraries/mx_srgb_texture_to_linrec2020_color4.glsl

@@ -1,8 +1,8 @@
-#include "libraries/stdlib/genglsl/lib/mx_transform_color.glsl"
+#include "libraries/adsk/maya/genglsl/lib/usd_transform_color.glsl"
 
 void mx_srgb_texture_to_linrec2020_color4(vec4 _in, out vec4 result)
 {
-    vec3 color = mx_srgb_texture_to_lin_rec709(_in.rgb);
+    vec3 color = usd_srgb_texture_to_lin_rec709(_in.rgb);
 
     // Same matrix as found in ../../vp2ShaderFragments/shaderFragments.cpp
     color = mat3(0.62740389, 0.06909729, 0.01639144,

lib/mayaUsd/render/MaterialXGenOgsXml/libraries/usd_transform_color.glsl

@@ -0,0 +1,7 @@
+vec3 usd_srgb_texture_to_lin_rec709(vec3 color)
+{
+    bvec3 isAbove = greaterThan(color, vec3(0.04045));
+    vec3 linSeg = color / 12.92;
+    vec3 powSeg = pow(max(color + vec3(0.055), vec3(0.0)) / 1.055, vec3(2.4));
+    return mix(linSeg, powSeg, vec3(isAbove));
+}

lib/mayaUsd/render/MaterialXGenOgsXml/libraries/usd_utilities_genglsl_impl.mtlx

@@ -18,8 +18,8 @@
   <implementation name="MayaIM_texcoordtangents_vector3_genglsl" nodedef="MayaND_texcoordtangents_vector3" file="libraries/adsk/maya/genglsl/mx_texcoordtangents_vector3.glsl" function="mx_texcoordtangents_vector3" target="genglsl" />
   <implementation name="MayaIM_arbitrarytangents_vector3_genglsl" nodedef="MayaND_arbitrarytangents_vector3" file="libraries/adsk/maya/genglsl/mx_arbitrarytangents_vector3.glsl" function="mx_arbitrarytangents_vector3" target="genglsl" />
 
-  <implementation name="MayaIM_sRGBtoLinrec709_color3_genglsl" nodedef="MayaND_sRGBtoLinrec709_color3" file="libraries/stdlib/genglsl/mx_srgb_texture_to_lin_rec709_color3.glsl" function="mx_srgb_texture_to_lin_rec709_color3" target="genglsl" />
-  <implementation name="MayaIM_sRGBtoLinrec709_color4_genglsl" nodedef="MayaND_sRGBtoLinrec709_color4" file="libraries/stdlib/genglsl/mx_srgb_texture_to_lin_rec709_color4.glsl" function="mx_srgb_texture_to_lin_rec709_color4" target="genglsl" />
+  <implementation name="MayaIM_sRGBtoLinrec709_color3_genglsl" nodedef="MayaND_sRGBtoLinrec709_color3" file="libraries/adsk/maya/genglsl/mx_srgb_texture_to_lin_rec709_color3.glsl" function="mx_srgb_texture_to_lin_rec709_color3" target="genglsl" />
+  <implementation name="MayaIM_sRGBtoLinrec709_color4_genglsl" nodedef="MayaND_sRGBtoLinrec709_color4" file="libraries/adsk/maya/genglsl/mx_srgb_texture_to_lin_rec709_color4.glsl" function="mx_srgb_texture_to_lin_rec709_color4" target="genglsl" />
   <implementation name="MayaIM_sRGBtoACEScg_color3_genglsl" nodedef="MayaND_sRGBtoACEScg_color3" file="libraries/adsk/maya/genglsl/mx_srgb_texture_to_acescg_color3.glsl" function="mx_srgb_texture_to_acescg_color3" target="genglsl" />
   <implementation name="MayaIM_sRGBtoACEScg_color4_genglsl" nodedef="MayaND_sRGBtoACEScg_color4" file="libraries/adsk/maya/genglsl/mx_srgb_texture_to_acescg_color4.glsl" function="mx_srgb_texture_to_acescg_color4" target="genglsl" />
   <implementation name="MayaIM_sRGBtoACES2065_color3_genglsl" nodedef="MayaND_sRGBtoACES2065_color3" file="libraries/adsk/maya/genglsl/mx_srgb_texture_to_aces_2065_1_color3.glsl" function="mx_srgb_texture_to_aces_2065_1_color3" target="genglsl" />