From 58f7c74421c22e3ce6a22994fb93b4166e409831 Mon Sep 17 00:00:00 2001
From: Kai Rohmer <krohmer@nvidia.com>
Date: Fri, 16 Aug 2024 13:54:09 +0200
Subject: [PATCH 1/3] add a custom implementation for combine2(color, float)
 because the index access is not allowed on the MDL color type

---
 libraries/stdlib/genmdl/stdlib_genmdl_impl.mtlx     | 2 +-
 source/MaterialXGenMdl/mdl/materialx/stdlib_1_6.mdl | 6 ++++++
 source/MaterialXGenMdl/mdl/materialx/stdlib_1_8.mdl | 1 +
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/libraries/stdlib/genmdl/stdlib_genmdl_impl.mtlx b/libraries/stdlib/genmdl/stdlib_genmdl_impl.mtlx
index ec4af76961..efdbc6bf2e 100644
--- a/libraries/stdlib/genmdl/stdlib_genmdl_impl.mtlx
+++ b/libraries/stdlib/genmdl/stdlib_genmdl_impl.mtlx
@@ -686,7 +686,7 @@
 
   <!-- <combine2> -->
   <implementation name="IM_combine2_vector2_genmdl" nodedef="ND_combine2_vector2" target="genmdl" sourcecode="float2( {{in1}},{{in2}} )" />
-  <implementation name="IM_combine2_color4CF_genmdl" nodedef="ND_combine2_color4CF" target="genmdl" sourcecode="color4( {{in1}}[0],{{in1}}[1],{{in1}}[2],{{in2}} )" />
+  <implementation name="IM_combine2_color4CF_genmdl" nodedef="ND_combine2_color4CF" target="genmdl" sourcecode="materialx::stdlib_{{MDL_VERSION_SUFFIX}}::mx_combine2_color4CF({{in1}}, {{in2}})" target="genmdl" />
   <implementation name="IM_combine2_vector4VF_genmdl" nodedef="ND_combine2_vector4VF" target="genmdl" sourcecode="float4( {{in1}}[0],{{in1}}[1],{{in1}}[2],{{in2}} )" />
   <implementation name="IM_combine2_vector4VV_genmdl" nodedef="ND_combine2_vector4VV" target="genmdl" sourcecode="float4( {{in1}}[0],{{in1}}[1],{{in2}}[0],{{in2}}[1] )" />
 
diff --git a/source/MaterialXGenMdl/mdl/materialx/stdlib_1_6.mdl b/source/MaterialXGenMdl/mdl/materialx/stdlib_1_6.mdl
index 8cfedd56a0..3cc1277451 100644
--- a/source/MaterialXGenMdl/mdl/materialx/stdlib_1_6.mdl
+++ b/source/MaterialXGenMdl/mdl/materialx/stdlib_1_6.mdl
@@ -4437,3 +4437,9 @@ export float3 mx_worleynoise3d_float3(
 {
     return noise::mx_worley_noise_float3(mxp_position, mxp_jitter, 0);
 }
+
+export core::color4 mx_combine2_color4CF(color in1, float in2)
+{
+	float3 in1_as_float3 = float3(in1);
+	return core::mk_color4(in1_as_float3.x, in1_as_float3.y, in1_as_float3.z, in2);	
+}
diff --git a/source/MaterialXGenMdl/mdl/materialx/stdlib_1_8.mdl b/source/MaterialXGenMdl/mdl/materialx/stdlib_1_8.mdl
index b6e7174114..bef1e430d4 100644
--- a/source/MaterialXGenMdl/mdl/materialx/stdlib_1_8.mdl
+++ b/source/MaterialXGenMdl/mdl/materialx/stdlib_1_8.mdl
@@ -321,6 +321,7 @@ export using .::stdlib_1_7 import mx_worleynoise2d_float3;
 export using .::stdlib_1_7 import mx_worleynoise3d_float;
 export using .::stdlib_1_7 import mx_worleynoise3d_float2;
 export using .::stdlib_1_7 import mx_worleynoise3d_float3;
+export using .::stdlib_1_7 import mx_combine2_color4CF;
 
 // NOTE: Not planned to be implemented.
 export using .::stdlib_1_7 import mx_geompropvalue_string;

From 2eb9584434907798e1a46795cb9a6bf17ede4b25 Mon Sep 17 00:00:00 2001
From: Jonathan Stone <jstone@lucasfilm.com>
Date: Fri, 16 Aug 2024 14:01:41 -0700
Subject: [PATCH 2/3] Remove extra target attribute

Signed-off-by: Jonathan Stone <jstone@lucasfilm.com>
---
 libraries/stdlib/genmdl/stdlib_genmdl_impl.mtlx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/stdlib/genmdl/stdlib_genmdl_impl.mtlx b/libraries/stdlib/genmdl/stdlib_genmdl_impl.mtlx
index efdbc6bf2e..51566463aa 100644
--- a/libraries/stdlib/genmdl/stdlib_genmdl_impl.mtlx
+++ b/libraries/stdlib/genmdl/stdlib_genmdl_impl.mtlx
@@ -686,7 +686,7 @@
 
   <!-- <combine2> -->
   <implementation name="IM_combine2_vector2_genmdl" nodedef="ND_combine2_vector2" target="genmdl" sourcecode="float2( {{in1}},{{in2}} )" />
-  <implementation name="IM_combine2_color4CF_genmdl" nodedef="ND_combine2_color4CF" target="genmdl" sourcecode="materialx::stdlib_{{MDL_VERSION_SUFFIX}}::mx_combine2_color4CF({{in1}}, {{in2}})" target="genmdl" />
+  <implementation name="IM_combine2_color4CF_genmdl" nodedef="ND_combine2_color4CF" target="genmdl" sourcecode="materialx::stdlib_{{MDL_VERSION_SUFFIX}}::mx_combine2_color4CF({{in1}}, {{in2}})" />
   <implementation name="IM_combine2_vector4VF_genmdl" nodedef="ND_combine2_vector4VF" target="genmdl" sourcecode="float4( {{in1}}[0],{{in1}}[1],{{in1}}[2],{{in2}} )" />
   <implementation name="IM_combine2_vector4VV_genmdl" nodedef="ND_combine2_vector4VV" target="genmdl" sourcecode="float4( {{in1}}[0],{{in1}}[1],{{in2}}[0],{{in2}}[1] )" />
 

From 76b52dcc7e8257ca139691f64acc0921b24d4dc3 Mon Sep 17 00:00:00 2001
From: Jonathan Stone <jstone@lucasfilm.com>
Date: Fri, 16 Aug 2024 14:12:47 -0700
Subject: [PATCH 3/3] Minor update to formatting

Signed-off-by: Jonathan Stone <jstone@lucasfilm.com>
---
 source/MaterialXGenMdl/mdl/materialx/stdlib_1_6.mdl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/source/MaterialXGenMdl/mdl/materialx/stdlib_1_6.mdl b/source/MaterialXGenMdl/mdl/materialx/stdlib_1_6.mdl
index 3cc1277451..601a10fda2 100644
--- a/source/MaterialXGenMdl/mdl/materialx/stdlib_1_6.mdl
+++ b/source/MaterialXGenMdl/mdl/materialx/stdlib_1_6.mdl
@@ -4440,6 +4440,6 @@ export float3 mx_worleynoise3d_float3(
 
 export core::color4 mx_combine2_color4CF(color in1, float in2)
 {
-	float3 in1_as_float3 = float3(in1);
-	return core::mk_color4(in1_as_float3.x, in1_as_float3.y, in1_as_float3.z, in2);	
+    float3 in1_as_float3 = float3(in1);
+    return core::mk_color4(in1_as_float3.x, in1_as_float3.y, in1_as_float3.z, in2);	
 }