From d1e3a0e2534ffad91eec3b2c338681a26bdf0fd5 Mon Sep 17 00:00:00 2001
From: Jonathan Stone <jstone@lucasfilm.com>
Date: Fri, 26 Apr 2024 13:57:06 -0700
Subject: [PATCH] Remove swizzle node for 1.39

This changelist removes the swizzle node from the MaterialX data libraries for v1.39, adding an upgrade pathway for instances of this node in legacy documents.

Additionally, it addresses a minor inconsistency in the specification for the extract and extractrowvector nodes, which take zero-based indices rather than positive-valued selections.
---
 .../Specification/MaterialX.Specification.md  |   4 +-
 .../stdlib/genglsl/stdlib_genglsl_impl.mtlx   |  43 ----
 .../stdlib/genmdl/stdlib_genmdl_impl.mtlx     |  37 ----
 .../stdlib/genmsl/stdlib_genmsl_impl.mtlx     |  43 ----
 .../stdlib/genosl/stdlib_genosl_impl.mtlx     |  43 ----
 libraries/stdlib/stdlib_defs.mtlx             | 188 ------------------
 source/MaterialXCore/Version.cpp              | 125 +++++++++++-
 7 files changed, 123 insertions(+), 360 deletions(-)

diff --git a/documents/Specification/MaterialX.Specification.md b/documents/Specification/MaterialX.Specification.md
index 9aca436656..61d947c6e4 100644
--- a/documents/Specification/MaterialX.Specification.md
+++ b/documents/Specification/MaterialX.Specification.md
@@ -1612,13 +1612,13 @@ Channel nodes are used to perform channel manipulations and data type conversion
 
 * **`extract`**: extract the specified channel number from a color<em>N</em> or vector<em>N</em> stream.
     * `in` (color<em>N</em> or vector<em>N</em>): the input value or nodename
-    * `which` (integer): the channel number to extract.  For color<em>N</em> streams, use "0" to extract the red channel, "1" for green, "2" for blue and "3" for alpha; for vector<em>N</em> streams, use "0" to extract the x channel, "1" for y, "2" for z and "3" for w.  Default is 0.
+    * `index` (integer): the channel number to extract.  For color<em>N</em> streams, use "0" to extract the red channel, "1" for green, "2" for blue and "3" for alpha; for vector<em>N</em> streams, use "0" to extract the x channel, "1" for y, "2" for z and "3" for w.  Default is 0.
 
 <a id="node-extractrowvector"> </a>
 
 * **`extractrowvector`**: extract the specified row vector number from a matrix<em>N</em> stream.
     * `in` (matrix<em>N</em>): the input value or nodename
-    * `which` (integer): the row number to extract, should be 0-2 for matrix33 streams, or 0-3 for matrix44 streams.
+    * `index` (integer): the row number to extract, should be 0-2 for matrix33 streams, or 0-3 for matrix44 streams.
 
 <a id="node-convert"> </a>
 
diff --git a/libraries/stdlib/genglsl/stdlib_genglsl_impl.mtlx b/libraries/stdlib/genglsl/stdlib_genglsl_impl.mtlx
index 2d4115d368..a04e19106a 100644
--- a/libraries/stdlib/genglsl/stdlib_genglsl_impl.mtlx
+++ b/libraries/stdlib/genglsl/stdlib_genglsl_impl.mtlx
@@ -683,49 +683,6 @@
   <implementation name="IM_convert_boolean_float_genglsl" nodedef="ND_convert_boolean_float" target="genglsl" />
   <implementation name="IM_convert_integer_float_genglsl" nodedef="ND_convert_integer_float" target="genglsl" />
 
-  <!-- <swizzle> -->
-  <!-- from type: float -->
-  <implementation name="IM_swizzle_float_color3_genglsl" nodedef="ND_swizzle_float_color3" target="genglsl" />
-  <implementation name="IM_swizzle_float_color4_genglsl" nodedef="ND_swizzle_float_color4" target="genglsl" />
-  <implementation name="IM_swizzle_float_vector2_genglsl" nodedef="ND_swizzle_float_vector2" target="genglsl" />
-  <implementation name="IM_swizzle_float_vector3_genglsl" nodedef="ND_swizzle_float_vector3" target="genglsl" />
-  <implementation name="IM_swizzle_float_vector4_genglsl" nodedef="ND_swizzle_float_vector4" target="genglsl" />
-  <!-- from type: color3 -->
-  <implementation name="IM_swizzle_color3_float_genglsl" nodedef="ND_swizzle_color3_float" target="genglsl" />
-  <implementation name="IM_swizzle_color3_color3_genglsl" nodedef="ND_swizzle_color3_color3" target="genglsl" />
-  <implementation name="IM_swizzle_color3_color4_genglsl" nodedef="ND_swizzle_color3_color4" target="genglsl" />
-  <implementation name="IM_swizzle_color3_vector2_genglsl" nodedef="ND_swizzle_color3_vector2" target="genglsl" />
-  <implementation name="IM_swizzle_color3_vector3_genglsl" nodedef="ND_swizzle_color3_vector3" target="genglsl" />
-  <implementation name="IM_swizzle_color3_vector4_genglsl" nodedef="ND_swizzle_color3_vector4" target="genglsl" />
-  <!-- from type: color4 -->
-  <implementation name="IM_swizzle_color4_float_genglsl" nodedef="ND_swizzle_color4_float" target="genglsl" />
-  <implementation name="IM_swizzle_color4_color3_genglsl" nodedef="ND_swizzle_color4_color3" target="genglsl" />
-  <implementation name="IM_swizzle_color4_color4_genglsl" nodedef="ND_swizzle_color4_color4" target="genglsl" />
-  <implementation name="IM_swizzle_color4_vector2_genglsl" nodedef="ND_swizzle_color4_vector2" target="genglsl" />
-  <implementation name="IM_swizzle_color4_vector3_genglsl" nodedef="ND_swizzle_color4_vector3" target="genglsl" />
-  <implementation name="IM_swizzle_color4_vector4_genglsl" nodedef="ND_swizzle_color4_vector4" target="genglsl" />
-  <!-- from type: vector2 -->
-  <implementation name="IM_swizzle_vector2_float_genglsl" nodedef="ND_swizzle_vector2_float" target="genglsl" />
-  <implementation name="IM_swizzle_vector2_color3_genglsl" nodedef="ND_swizzle_vector2_color3" target="genglsl" />
-  <implementation name="IM_swizzle_vector2_color4_genglsl" nodedef="ND_swizzle_vector2_color4" target="genglsl" />
-  <implementation name="IM_swizzle_vector2_vector2_genglsl" nodedef="ND_swizzle_vector2_vector2" target="genglsl" />
-  <implementation name="IM_swizzle_vector2_vector3_genglsl" nodedef="ND_swizzle_vector2_vector3" target="genglsl" />
-  <implementation name="IM_swizzle_vector2_vector4_genglsl" nodedef="ND_swizzle_vector2_vector4" target="genglsl" />
-  <!-- from type: vector3 -->
-  <implementation name="IM_swizzle_vector3_float_genglsl" nodedef="ND_swizzle_vector3_float" target="genglsl" />
-  <implementation name="IM_swizzle_vector3_color3_genglsl" nodedef="ND_swizzle_vector3_color3" target="genglsl" />
-  <implementation name="IM_swizzle_vector3_color4_genglsl" nodedef="ND_swizzle_vector3_color4" target="genglsl" />
-  <implementation name="IM_swizzle_vector3_vector2_genglsl" nodedef="ND_swizzle_vector3_vector2" target="genglsl" />
-  <implementation name="IM_swizzle_vector3_vector3_genglsl" nodedef="ND_swizzle_vector3_vector3" target="genglsl" />
-  <implementation name="IM_swizzle_vector3_vector4_genglsl" nodedef="ND_swizzle_vector3_vector4" target="genglsl" />
-  <!-- from type: vector4 -->
-  <implementation name="IM_swizzle_vector4_float_genglsl" nodedef="ND_swizzle_vector4_float" target="genglsl" />
-  <implementation name="IM_swizzle_vector4_color3_genglsl" nodedef="ND_swizzle_vector4_color3" target="genglsl" />
-  <implementation name="IM_swizzle_vector4_color4_genglsl" nodedef="ND_swizzle_vector4_color4" target="genglsl" />
-  <implementation name="IM_swizzle_vector4_vector2_genglsl" nodedef="ND_swizzle_vector4_vector2" target="genglsl" />
-  <implementation name="IM_swizzle_vector4_vector3_genglsl" nodedef="ND_swizzle_vector4_vector3" target="genglsl" />
-  <implementation name="IM_swizzle_vector4_vector4_genglsl" nodedef="ND_swizzle_vector4_vector4" target="genglsl" />
-
   <!-- <combine> -->
   <implementation name="IM_combine2_vector2_genglsl" nodedef="ND_combine2_vector2" target="genglsl" />
   <implementation name="IM_combine2_color4CF_genglsl" nodedef="ND_combine2_color4CF" target="genglsl" />
diff --git a/libraries/stdlib/genmdl/stdlib_genmdl_impl.mtlx b/libraries/stdlib/genmdl/stdlib_genmdl_impl.mtlx
index eac21fb19c..1e833b78f3 100644
--- a/libraries/stdlib/genmdl/stdlib_genmdl_impl.mtlx
+++ b/libraries/stdlib/genmdl/stdlib_genmdl_impl.mtlx
@@ -691,43 +691,6 @@
   <implementation name="IM_convert_boolean_float_genmdl" nodedef="ND_convert_boolean_float" target="genmdl" />
   <implementation name="IM_convert_integer_float_genmdl" nodedef="ND_convert_integer_float" target="genmdl" />
 
-  <!-- <swizzle> -->
-  <implementation name="IM_swizzle_float_color3_genmdl" nodedef="ND_swizzle_float_color3" target="genmdl" />
-  <implementation name="IM_swizzle_float_color4_genmdl" nodedef="ND_swizzle_float_color4" target="genmdl" />
-  <implementation name="IM_swizzle_float_vector2_genmdl" nodedef="ND_swizzle_float_vector2" target="genmdl" />
-  <implementation name="IM_swizzle_float_vector3_genmdl" nodedef="ND_swizzle_float_vector3" target="genmdl" />
-  <implementation name="IM_swizzle_float_vector4_genmdl" nodedef="ND_swizzle_float_vector4" target="genmdl" />
-  <implementation name="IM_swizzle_color3_float_genmdl" nodedef="ND_swizzle_color3_float" target="genmdl" />
-  <implementation name="IM_swizzle_color3_color3_genmdl" nodedef="ND_swizzle_color3_color3" target="genmdl" />
-  <implementation name="IM_swizzle_color3_color4_genmdl" nodedef="ND_swizzle_color3_color4" target="genmdl" />
-  <implementation name="IM_swizzle_color3_vector2_genmdl" nodedef="ND_swizzle_color3_vector2" target="genmdl" />
-  <implementation name="IM_swizzle_color3_vector3_genmdl" nodedef="ND_swizzle_color3_vector3" target="genmdl" />
-  <implementation name="IM_swizzle_color3_vector4_genmdl" nodedef="ND_swizzle_color3_vector4" target="genmdl" />
-  <implementation name="IM_swizzle_color4_float_genmdl" nodedef="ND_swizzle_color4_float" target="genmdl" />
-  <implementation name="IM_swizzle_color4_color3_genmdl" nodedef="ND_swizzle_color4_color3" target="genmdl" />
-  <implementation name="IM_swizzle_color4_color4_genmdl" nodedef="ND_swizzle_color4_color4" target="genmdl" />
-  <implementation name="IM_swizzle_color4_vector2_genmdl" nodedef="ND_swizzle_color4_vector2" target="genmdl" />
-  <implementation name="IM_swizzle_color4_vector3_genmdl" nodedef="ND_swizzle_color4_vector3" target="genmdl" />
-  <implementation name="IM_swizzle_color4_vector4_genmdl" nodedef="ND_swizzle_color4_vector4" target="genmdl" />
-  <implementation name="IM_swizzle_vector2_float_genmdl" nodedef="ND_swizzle_vector2_float" target="genmdl" />
-  <implementation name="IM_swizzle_vector2_color3_genmdl" nodedef="ND_swizzle_vector2_color3" target="genmdl" />
-  <implementation name="IM_swizzle_vector2_color4_genmdl" nodedef="ND_swizzle_vector2_color4" target="genmdl" />
-  <implementation name="IM_swizzle_vector2_vector2_genmdl" nodedef="ND_swizzle_vector2_vector2" target="genmdl" />
-  <implementation name="IM_swizzle_vector2_vector3_genmdl" nodedef="ND_swizzle_vector2_vector3" target="genmdl" />
-  <implementation name="IM_swizzle_vector2_vector4_genmdl" nodedef="ND_swizzle_vector2_vector4" target="genmdl" />
-  <implementation name="IM_swizzle_vector3_float_genmdl" nodedef="ND_swizzle_vector3_float" target="genmdl" />
-  <implementation name="IM_swizzle_vector3_color3_genmdl" nodedef="ND_swizzle_vector3_color3" target="genmdl" />
-  <implementation name="IM_swizzle_vector3_color4_genmdl" nodedef="ND_swizzle_vector3_color4" target="genmdl" />
-  <implementation name="IM_swizzle_vector3_vector2_genmdl" nodedef="ND_swizzle_vector3_vector2" target="genmdl" />
-  <implementation name="IM_swizzle_vector3_vector3_genmdl" nodedef="ND_swizzle_vector3_vector3" target="genmdl" />
-  <implementation name="IM_swizzle_vector3_vector4_genmdl" nodedef="ND_swizzle_vector3_vector4" target="genmdl" />
-  <implementation name="IM_swizzle_vector4_float_genmdl" nodedef="ND_swizzle_vector4_float" target="genmdl" />
-  <implementation name="IM_swizzle_vector4_color3_genmdl" nodedef="ND_swizzle_vector4_color3" target="genmdl" />
-  <implementation name="IM_swizzle_vector4_color4_genmdl" nodedef="ND_swizzle_vector4_color4" target="genmdl" />
-  <implementation name="IM_swizzle_vector4_vector2_genmdl" nodedef="ND_swizzle_vector4_vector2" target="genmdl" />
-  <implementation name="IM_swizzle_vector4_vector3_genmdl" nodedef="ND_swizzle_vector4_vector3" target="genmdl" />
-  <implementation name="IM_swizzle_vector4_vector4_genmdl" nodedef="ND_swizzle_vector4_vector4" target="genmdl" />
-
   <!-- <combine2> -->
   <implementation name="IM_combine2_vector2_genmdl" nodedef="ND_combine2_vector2" target="genmdl" />
   <implementation name="IM_combine2_color4CF_genmdl" nodedef="ND_combine2_color4CF" target="genmdl" />
diff --git a/libraries/stdlib/genmsl/stdlib_genmsl_impl.mtlx b/libraries/stdlib/genmsl/stdlib_genmsl_impl.mtlx
index 61d67e5ebc..9d352695a3 100644
--- a/libraries/stdlib/genmsl/stdlib_genmsl_impl.mtlx
+++ b/libraries/stdlib/genmsl/stdlib_genmsl_impl.mtlx
@@ -683,49 +683,6 @@
   <implementation name="IM_convert_boolean_float_genmsl" nodedef="ND_convert_boolean_float" target="genmsl" />
   <implementation name="IM_convert_integer_float_genmsl" nodedef="ND_convert_integer_float" target="genmsl" />
 
-  <!-- <swizzle> -->
-  <!-- from type: float -->
-  <implementation name="IM_swizzle_float_color3_genmsl" nodedef="ND_swizzle_float_color3" target="genmsl" />
-  <implementation name="IM_swizzle_float_color4_genmsl" nodedef="ND_swizzle_float_color4" target="genmsl" />
-  <implementation name="IM_swizzle_float_vector2_genmsl" nodedef="ND_swizzle_float_vector2" target="genmsl" />
-  <implementation name="IM_swizzle_float_vector3_genmsl" nodedef="ND_swizzle_float_vector3" target="genmsl" />
-  <implementation name="IM_swizzle_float_vector4_genmsl" nodedef="ND_swizzle_float_vector4" target="genmsl" />
-  <!-- from type: color3 -->
-  <implementation name="IM_swizzle_color3_float_genmsl" nodedef="ND_swizzle_color3_float" target="genmsl" />
-  <implementation name="IM_swizzle_color3_color3_genmsl" nodedef="ND_swizzle_color3_color3" target="genmsl" />
-  <implementation name="IM_swizzle_color3_color4_genmsl" nodedef="ND_swizzle_color3_color4" target="genmsl" />
-  <implementation name="IM_swizzle_color3_vector2_genmsl" nodedef="ND_swizzle_color3_vector2" target="genmsl" />
-  <implementation name="IM_swizzle_color3_vector3_genmsl" nodedef="ND_swizzle_color3_vector3" target="genmsl" />
-  <implementation name="IM_swizzle_color3_vector4_genmsl" nodedef="ND_swizzle_color3_vector4" target="genmsl" />
-  <!-- from type: color4 -->
-  <implementation name="IM_swizzle_color4_float_genmsl" nodedef="ND_swizzle_color4_float" target="genmsl" />
-  <implementation name="IM_swizzle_color4_color3_genmsl" nodedef="ND_swizzle_color4_color3" target="genmsl" />
-  <implementation name="IM_swizzle_color4_color4_genmsl" nodedef="ND_swizzle_color4_color4" target="genmsl" />
-  <implementation name="IM_swizzle_color4_vector2_genmsl" nodedef="ND_swizzle_color4_vector2" target="genmsl" />
-  <implementation name="IM_swizzle_color4_vector3_genmsl" nodedef="ND_swizzle_color4_vector3" target="genmsl" />
-  <implementation name="IM_swizzle_color4_vector4_genmsl" nodedef="ND_swizzle_color4_vector4" target="genmsl" />
-  <!-- from type: vector2 -->
-  <implementation name="IM_swizzle_vector2_float_genmsl" nodedef="ND_swizzle_vector2_float" target="genmsl" />
-  <implementation name="IM_swizzle_vector2_color3_genmsl" nodedef="ND_swizzle_vector2_color3" target="genmsl" />
-  <implementation name="IM_swizzle_vector2_color4_genmsl" nodedef="ND_swizzle_vector2_color4" target="genmsl" />
-  <implementation name="IM_swizzle_vector2_vector2_genmsl" nodedef="ND_swizzle_vector2_vector2" target="genmsl" />
-  <implementation name="IM_swizzle_vector2_vector3_genmsl" nodedef="ND_swizzle_vector2_vector3" target="genmsl" />
-  <implementation name="IM_swizzle_vector2_vector4_genmsl" nodedef="ND_swizzle_vector2_vector4" target="genmsl" />
-  <!-- from type: vector3 -->
-  <implementation name="IM_swizzle_vector3_float_genmsl" nodedef="ND_swizzle_vector3_float" target="genmsl" />
-  <implementation name="IM_swizzle_vector3_color3_genmsl" nodedef="ND_swizzle_vector3_color3" target="genmsl" />
-  <implementation name="IM_swizzle_vector3_color4_genmsl" nodedef="ND_swizzle_vector3_color4" target="genmsl" />
-  <implementation name="IM_swizzle_vector3_vector2_genmsl" nodedef="ND_swizzle_vector3_vector2" target="genmsl" />
-  <implementation name="IM_swizzle_vector3_vector3_genmsl" nodedef="ND_swizzle_vector3_vector3" target="genmsl" />
-  <implementation name="IM_swizzle_vector3_vector4_genmsl" nodedef="ND_swizzle_vector3_vector4" target="genmsl" />
-  <!-- from type: vector4 -->
-  <implementation name="IM_swizzle_vector4_float_genmsl" nodedef="ND_swizzle_vector4_float" target="genmsl" />
-  <implementation name="IM_swizzle_vector4_color3_genmsl" nodedef="ND_swizzle_vector4_color3" target="genmsl" />
-  <implementation name="IM_swizzle_vector4_color4_genmsl" nodedef="ND_swizzle_vector4_color4" target="genmsl" />
-  <implementation name="IM_swizzle_vector4_vector2_genmsl" nodedef="ND_swizzle_vector4_vector2" target="genmsl" />
-  <implementation name="IM_swizzle_vector4_vector3_genmsl" nodedef="ND_swizzle_vector4_vector3" target="genmsl" />
-  <implementation name="IM_swizzle_vector4_vector4_genmsl" nodedef="ND_swizzle_vector4_vector4" target="genmsl" />
-
   <!-- <combine> -->
   <implementation name="IM_combine2_vector2_genmsl" nodedef="ND_combine2_vector2" target="genmsl" />
   <implementation name="IM_combine2_color4CF_genmsl" nodedef="ND_combine2_color4CF" target="genmsl" />
diff --git a/libraries/stdlib/genosl/stdlib_genosl_impl.mtlx b/libraries/stdlib/genosl/stdlib_genosl_impl.mtlx
index 16c8e6b6d0..037086ddef 100644
--- a/libraries/stdlib/genosl/stdlib_genosl_impl.mtlx
+++ b/libraries/stdlib/genosl/stdlib_genosl_impl.mtlx
@@ -682,49 +682,6 @@
   <implementation name="IM_convert_boolean_float_genosl" nodedef="ND_convert_boolean_float" target="genosl" />
   <implementation name="IM_convert_integer_float_genosl" nodedef="ND_convert_integer_float" target="genosl" />
 
-  <!-- <swizzle> -->
-  <!-- from type: float -->
-  <implementation name="IM_swizzle_float_color3_genosl" nodedef="ND_swizzle_float_color3" target="genosl" />
-  <implementation name="IM_swizzle_float_color4_genosl" nodedef="ND_swizzle_float_color4" target="genosl" />
-  <implementation name="IM_swizzle_float_vector2_genosl" nodedef="ND_swizzle_float_vector2" target="genosl" />
-  <implementation name="IM_swizzle_float_vector3_genosl" nodedef="ND_swizzle_float_vector3" target="genosl" />
-  <implementation name="IM_swizzle_float_vector4_genosl" nodedef="ND_swizzle_float_vector4" target="genosl" />
-  <!-- from type: color3 -->
-  <implementation name="IM_swizzle_color3_float_genosl" nodedef="ND_swizzle_color3_float" target="genosl" />
-  <implementation name="IM_swizzle_color3_color3_genosl" nodedef="ND_swizzle_color3_color3" target="genosl" />
-  <implementation name="IM_swizzle_color3_color4_genosl" nodedef="ND_swizzle_color3_color4" target="genosl" />
-  <implementation name="IM_swizzle_color3_vector2_genosl" nodedef="ND_swizzle_color3_vector2" target="genosl" />
-  <implementation name="IM_swizzle_color3_vector3_genosl" nodedef="ND_swizzle_color3_vector3" target="genosl" />
-  <implementation name="IM_swizzle_color3_vector4_genosl" nodedef="ND_swizzle_color3_vector4" target="genosl" />
-  <!-- from type: color4 -->
-  <implementation name="IM_swizzle_color4_float_genosl" nodedef="ND_swizzle_color4_float" target="genosl" />
-  <implementation name="IM_swizzle_color4_color3_genosl" nodedef="ND_swizzle_color4_color3" target="genosl" />
-  <implementation name="IM_swizzle_color4_color4_genosl" nodedef="ND_swizzle_color4_color4" target="genosl" />
-  <implementation name="IM_swizzle_color4_vector2_genosl" nodedef="ND_swizzle_color4_vector2" target="genosl" />
-  <implementation name="IM_swizzle_color4_vector3_genosl" nodedef="ND_swizzle_color4_vector3" target="genosl" />
-  <implementation name="IM_swizzle_color4_vector4_genosl" nodedef="ND_swizzle_color4_vector4" target="genosl" />
-  <!-- from type: vector2 -->
-  <implementation name="IM_swizzle_vector2_float_genosl" nodedef="ND_swizzle_vector2_float" target="genosl" />
-  <implementation name="IM_swizzle_vector2_color3_genosl" nodedef="ND_swizzle_vector2_color3" target="genosl" />
-  <implementation name="IM_swizzle_vector2_color4_genosl" nodedef="ND_swizzle_vector2_color4" target="genosl" />
-  <implementation name="IM_swizzle_vector2_vector2_genosl" nodedef="ND_swizzle_vector2_vector2" target="genosl" />
-  <implementation name="IM_swizzle_vector2_vector3_genosl" nodedef="ND_swizzle_vector2_vector3" target="genosl" />
-  <implementation name="IM_swizzle_vector2_vector4_genosl" nodedef="ND_swizzle_vector2_vector4" target="genosl" />
-  <!-- from type: vector3 -->
-  <implementation name="IM_swizzle_vector3_float_genosl" nodedef="ND_swizzle_vector3_float" target="genosl" />
-  <implementation name="IM_swizzle_vector3_color3_genosl" nodedef="ND_swizzle_vector3_color3" target="genosl" />
-  <implementation name="IM_swizzle_vector3_color4_genosl" nodedef="ND_swizzle_vector3_color4" target="genosl" />
-  <implementation name="IM_swizzle_vector3_vector2_genosl" nodedef="ND_swizzle_vector3_vector2" target="genosl" />
-  <implementation name="IM_swizzle_vector3_vector3_genosl" nodedef="ND_swizzle_vector3_vector3" target="genosl" />
-  <implementation name="IM_swizzle_vector3_vector4_genosl" nodedef="ND_swizzle_vector3_vector4" target="genosl" />
-  <!-- from type: vector4 -->
-  <implementation name="IM_swizzle_vector4_float_genosl" nodedef="ND_swizzle_vector4_float" target="genosl" />
-  <implementation name="IM_swizzle_vector4_color3_genosl" nodedef="ND_swizzle_vector4_color3" target="genosl" />
-  <implementation name="IM_swizzle_vector4_color4_genosl" nodedef="ND_swizzle_vector4_color4" target="genosl" />
-  <implementation name="IM_swizzle_vector4_vector2_genosl" nodedef="ND_swizzle_vector4_vector2" target="genosl" />
-  <implementation name="IM_swizzle_vector4_vector3_genosl" nodedef="ND_swizzle_vector4_vector3" target="genosl" />
-  <implementation name="IM_swizzle_vector4_vector4_genosl" nodedef="ND_swizzle_vector4_vector4" target="genosl" />
-
   <!-- <combine2> -->
   <implementation name="IM_combine2_vector2_genosl" nodedef="ND_combine2_vector2" target="genosl" />
   <implementation name="IM_combine2_color4CF_genosl" nodedef="ND_combine2_color4CF" target="genosl" />
diff --git a/libraries/stdlib/stdlib_defs.mtlx b/libraries/stdlib/stdlib_defs.mtlx
index 00a74813da..7521dec080 100644
--- a/libraries/stdlib/stdlib_defs.mtlx
+++ b/libraries/stdlib/stdlib_defs.mtlx
@@ -4271,194 +4271,6 @@
     <output name="out" type="surfaceshader" />
   </nodedef>
 
-  <!--
-    Node: <swizzle>
-    Perform an arbitrary permutation of the channels of the input stream, returning a new
-    stream of the specified type. Individual channels may be replicated or omitted, and the output
-    stream may have a different number of channels than the input.
-  -->
-  <!-- from type: float -->
-  <nodedef name="ND_swizzle_float_color3" node="swizzle" nodegroup="channel">
-    <input name="in" type="float" value="0.0" />
-    <input name="channels" type="string" value="rrr" uniform="true" />
-    <output name="out" type="color3" default="0.0, 0.0, 0.0" />
-  </nodedef>
-  <nodedef name="ND_swizzle_float_color4" node="swizzle" nodegroup="channel">
-    <input name="in" type="float" value="0.0" />
-    <input name="channels" type="string" value="rrrr" uniform="true" />
-    <output name="out" type="color4" default="0.0, 0.0, 0.0, 0.0" />
-  </nodedef>
-  <nodedef name="ND_swizzle_float_vector2" node="swizzle" nodegroup="channel">
-    <input name="in" type="float" value="0.0" />
-    <input name="channels" type="string" value="xx" uniform="true" />
-    <output name="out" type="vector2" default="0.0, 0.0" />
-  </nodedef>
-  <nodedef name="ND_swizzle_float_vector3" node="swizzle" nodegroup="channel">
-    <input name="in" type="float" value="0.0" />
-    <input name="channels" type="string" value="xxx" uniform="true" />
-    <output name="out" type="vector3" default="0.0, 0.0, 0.0" />
-  </nodedef>
-  <nodedef name="ND_swizzle_float_vector4" node="swizzle" nodegroup="channel">
-    <input name="in" type="float" value="0.0" />
-    <input name="channels" type="string" value="xxxx" uniform="true" />
-    <output name="out" type="vector4" default="0.0, 0.0, 0.0, 0.0" />
-  </nodedef>
-  <!-- from type: color3 -->
-  <nodedef name="ND_swizzle_color3_float" node="swizzle" nodegroup="channel">
-    <input name="in" type="color3" value="0.0, 0.0, 0.0" />
-    <input name="channels" type="string" value="r" uniform="true" />
-    <output name="out" type="float" default="0.0" />
-  </nodedef>
-  <nodedef name="ND_swizzle_color3_color3" node="swizzle" nodegroup="channel">
-    <input name="in" type="color3" value="0.0, 0.0, 0.0" />
-    <input name="channels" type="string" value="rrr" uniform="true" />
-    <output name="out" type="color3" defaultinput="in" />
-  </nodedef>
-  <nodedef name="ND_swizzle_color3_color4" node="swizzle" nodegroup="channel">
-    <input name="in" type="color3" value="0.0, 0.0, 0.0" />
-    <input name="channels" type="string" value="rrrr" uniform="true" />
-    <output name="out" type="color4" default="0.0, 0.0, 0.0, 0.0" />
-  </nodedef>
-  <nodedef name="ND_swizzle_color3_vector2" node="swizzle" nodegroup="channel">
-    <input name="in" type="color3" value="0.0, 0.0, 0.0" />
-    <input name="channels" type="string" value="rr" uniform="true" />
-    <output name="out" type="vector2" default="0.0, 0.0" />
-  </nodedef>
-  <nodedef name="ND_swizzle_color3_vector3" node="swizzle" nodegroup="channel">
-    <input name="in" type="color3" value="0.0, 0.0, 0.0" />
-    <input name="channels" type="string" value="rrr" uniform="true" />
-    <output name="out" type="vector3" default="0.0, 0.0, 0.0" />
-  </nodedef>
-  <nodedef name="ND_swizzle_color3_vector4" node="swizzle" nodegroup="channel">
-    <input name="in" type="color3" value="0.0, 0.0, 0.0" />
-    <input name="channels" type="string" value="rrrr" uniform="true" />
-    <output name="out" type="vector4" default="0.0, 0.0, 0.0, 0.0" />
-  </nodedef>
-  <!-- from type: color4 -->
-  <nodedef name="ND_swizzle_color4_float" node="swizzle" nodegroup="channel">
-    <input name="in" type="color4" value="0.0, 0.0, 0.0, 0.0" />
-    <input name="channels" type="string" value="r" uniform="true" />
-    <output name="out" type="float" default="0.0" />
-  </nodedef>
-  <nodedef name="ND_swizzle_color4_color3" node="swizzle" nodegroup="channel">
-    <input name="in" type="color4" value="0.0, 0.0, 0.0, 0.0" />
-    <input name="channels" type="string" value="rrr" uniform="true" />
-    <output name="out" type="color3" default="0.0, 0.0, 0.0" />
-  </nodedef>
-  <nodedef name="ND_swizzle_color4_color4" node="swizzle" nodegroup="channel">
-    <input name="in" type="color4" value="0.0, 0.0, 0.0, 0.0" />
-    <input name="channels" type="string" value="rrrr" uniform="true" />
-    <output name="out" type="color4" defaultinput="in" />
-  </nodedef>
-  <nodedef name="ND_swizzle_color4_vector2" node="swizzle" nodegroup="channel">
-    <input name="in" type="color4" value="0.0, 0.0, 0.0, 0.0" />
-    <input name="channels" type="string" value="rr" uniform="true" />
-    <output name="out" type="vector2" default="0.0, 0.0" />
-  </nodedef>
-  <nodedef name="ND_swizzle_color4_vector3" node="swizzle" nodegroup="channel">
-    <input name="in" type="color4" value="0.0, 0.0, 0.0, 0.0" />
-    <input name="channels" type="string" value="rrr" uniform="true" />
-    <output name="out" type="vector3" default="0.0, 0.0, 0.0" />
-  </nodedef>
-  <nodedef name="ND_swizzle_color4_vector4" node="swizzle" nodegroup="channel">
-    <input name="in" type="color4" value="0.0, 0.0, 0.0, 0.0" />
-    <input name="channels" type="string" value="rrrr" uniform="true" />
-    <output name="out" type="vector4" default="0.0, 0.0, 0.0, 0.0" />
-  </nodedef>
-  <!-- from type: vector2 -->
-  <nodedef name="ND_swizzle_vector2_float" node="swizzle" nodegroup="channel">
-    <input name="in" type="vector2" value="0.0, 0.0" />
-    <input name="channels" type="string" value="x" uniform="true" />
-    <output name="out" type="float" default="0.0" />
-  </nodedef>
-  <nodedef name="ND_swizzle_vector2_color3" node="swizzle" nodegroup="channel">
-    <input name="in" type="vector2" value="0.0, 0.0" />
-    <input name="channels" type="string" value="xxx" uniform="true" />
-    <output name="out" type="color3" default="0.0, 0.0, 0.0" />
-  </nodedef>
-  <nodedef name="ND_swizzle_vector2_color4" node="swizzle" nodegroup="channel">
-    <input name="in" type="vector2" value="0.0, 0.0" />
-    <input name="channels" type="string" value="xxxx" uniform="true" />
-    <output name="out" type="color4" default="0.0, 0.0, 0.0, 0.0" />
-  </nodedef>
-  <nodedef name="ND_swizzle_vector2_vector2" node="swizzle" nodegroup="channel">
-    <input name="in" type="vector2" value="0.0, 0.0" />
-    <input name="channels" type="string" value="xx" uniform="true" />
-    <output name="out" type="vector2" defaultinput="in" />
-  </nodedef>
-  <nodedef name="ND_swizzle_vector2_vector3" node="swizzle" nodegroup="channel">
-    <input name="in" type="vector2" value="0.0, 0.0" />
-    <input name="channels" type="string" value="xxx" uniform="true" />
-    <output name="out" type="vector3" default="0.0, 0.0, 0.0" />
-  </nodedef>
-  <nodedef name="ND_swizzle_vector2_vector4" node="swizzle" nodegroup="channel">
-    <input name="in" type="vector2" value="0.0, 0.0" />
-    <input name="channels" type="string" value="xxxx" uniform="true" />
-    <output name="out" type="vector4" default="0.0, 0.0, 0.0, 0.0" />
-  </nodedef>
-  <!-- from type: vector3 -->
-  <nodedef name="ND_swizzle_vector3_float" node="swizzle" nodegroup="channel">
-    <input name="in" type="vector3" value="0.0, 0.0, 0.0" />
-    <input name="channels" type="string" value="x" uniform="true" />
-    <output name="out" type="float" default="0.0" />
-  </nodedef>
-  <nodedef name="ND_swizzle_vector3_color3" node="swizzle" nodegroup="channel">
-    <input name="in" type="vector3" value="0.0, 0.0, 0.0" />
-    <input name="channels" type="string" value="xxx" uniform="true" />
-    <output name="out" type="color3" default="0.0, 0.0, 0.0" />
-  </nodedef>
-  <nodedef name="ND_swizzle_vector3_color4" node="swizzle" nodegroup="channel">
-    <input name="in" type="vector3" value="0.0, 0.0, 0.0" />
-    <input name="channels" type="string" value="xxxx" uniform="true" />
-    <output name="out" type="color4" default="0.0, 0.0, 0.0, 0.0" />
-  </nodedef>
-  <nodedef name="ND_swizzle_vector3_vector2" node="swizzle" nodegroup="channel">
-    <input name="in" type="vector3" value="0.0, 0.0, 0.0" />
-    <input name="channels" type="string" value="xx" uniform="true" />
-    <output name="out" type="vector2" default="0.0, 0.0" />
-  </nodedef>
-  <nodedef name="ND_swizzle_vector3_vector3" node="swizzle" nodegroup="channel">
-    <input name="in" type="vector3" value="0.0, 0.0, 0.0" />
-    <input name="channels" type="string" value="xxx" uniform="true" />
-    <output name="out" type="vector3" defaultinput="in" />
-  </nodedef>
-  <nodedef name="ND_swizzle_vector3_vector4" node="swizzle" nodegroup="channel">
-    <input name="in" type="vector3" value="0.0, 0.0, 0.0" />
-    <input name="channels" type="string" value="xxxx" uniform="true" />
-    <output name="out" type="vector4" default="0.0, 0.0, 0.0, 0.0" />
-  </nodedef>
-  <!-- from type: vector4 -->
-  <nodedef name="ND_swizzle_vector4_float" node="swizzle" nodegroup="channel">
-    <input name="in" type="vector4" value="0.0, 0.0, 0.0, 0.0" />
-    <input name="channels" type="string" value="x" uniform="true" />
-    <output name="out" type="float" default="0.0" />
-  </nodedef>
-  <nodedef name="ND_swizzle_vector4_color3" node="swizzle" nodegroup="channel">
-    <input name="in" type="vector4" value="0.0, 0.0, 0.0, 0.0" />
-    <input name="channels" type="string" value="xxx" uniform="true" />
-    <output name="out" type="color3" default="0.0, 0.0, 0.0" />
-  </nodedef>
-  <nodedef name="ND_swizzle_vector4_color4" node="swizzle" nodegroup="channel">
-    <input name="in" type="vector4" value="0.0, 0.0, 0.0, 0.0" />
-    <input name="channels" type="string" value="xxxx" uniform="true" />
-    <output name="out" type="color4" default="0.0, 0.0, 0.0, 0.0" />
-  </nodedef>
-  <nodedef name="ND_swizzle_vector4_vector2" node="swizzle" nodegroup="channel">
-    <input name="in" type="vector4" value="0.0, 0.0, 0.0, 0.0" />
-    <input name="channels" type="string" value="xx" uniform="true" />
-    <output name="out" type="vector2" default="0.0, 0.0" />
-  </nodedef>
-  <nodedef name="ND_swizzle_vector4_vector3" node="swizzle" nodegroup="channel">
-    <input name="in" type="vector4" value="0.0, 0.0, 0.0, 0.0" />
-    <input name="channels" type="string" value="xxx" uniform="true" />
-    <output name="out" type="vector3" default="0.0, 0.0, 0.0" />
-  </nodedef>
-  <nodedef name="ND_swizzle_vector4_vector4" node="swizzle" nodegroup="channel">
-    <input name="in" type="vector4" value="0.0, 0.0, 0.0, 0.0" />
-    <input name="channels" type="string" value="xxxx" uniform="true" />
-    <output name="out" type="vector4" defaultinput="in" />
-  </nodedef>
-
   <!--
     Node: <combine2>
     Combine the channels from two streams into the same number of channels of a
diff --git a/source/MaterialXCore/Version.cpp b/source/MaterialXCore/Version.cpp
index 2d25b31622..12adba2691 100644
--- a/source/MaterialXCore/Version.cpp
+++ b/source/MaterialXCore/Version.cpp
@@ -1019,6 +1019,26 @@ void Document::upgradeVersion()
     // Upgrade from 1.38 to 1.39
     if (majorVersion == 1 && minorVersion == 38)
     {
+        const std::unordered_map<char, size_t> CHANNEL_INDEX_MAP =
+        {
+            { 'r', 0 }, { 'g', 1 }, { 'b', 2 }, { 'a', 3 },
+            { 'x', 0 }, { 'y', 1 }, { 'z', 2 }, { 'w', 3 }
+        };
+        const std::unordered_map<char, float> CHANNEL_CONSTANT_MAP =
+        {
+            { '0', 0.0f }, { '1', 1.0f }
+        };
+        const std::unordered_map<string, size_t> CHANNEL_COUNT_MAP =
+        {
+            { "float", 1 },
+            { "color3", 3 }, { "color4", 4 },
+            { "vector2", 2 }, { "vector3", 3 }, { "vector4", 4 }
+        };
+        const StringSet CHANNEL_CONVERT_PATTERNS =
+        {
+            "rgb", "rgba", "xyz", "xyzw"
+        };
+
         // Update all nodes.
         for (ElementPtr elem : traverseTree())
         {
@@ -1077,6 +1097,107 @@ void Document::upgradeVersion()
                     }
                 }
             }
+            else if (nodeCategory == "swizzle")
+            {
+                InputPtr inInput = node->getInput("in");
+                InputPtr channelsInput = node->getInput("channels");
+                if (inInput &&
+                    CHANNEL_COUNT_MAP.count(inInput->getType()) &&
+                    CHANNEL_COUNT_MAP.count(node->getType()))
+                {
+                    string channelString = channelsInput ? channelsInput->getValueString() : EMPTY_STRING;
+                    size_t sourceChannelCount = CHANNEL_COUNT_MAP.at(inInput->getType());
+                    size_t destChannelCount = CHANNEL_COUNT_MAP.at(node->getType());
+                    if (inInput->hasValue())
+                    {
+                        // Replace swizzle with constant.
+                        node->setCategory("constant");
+                        string valueString = inInput->getValueString();
+                        StringVec origValueTokens = splitString(valueString, ARRAY_VALID_SEPARATORS);
+                        StringVec newValueTokens;
+                        for (size_t i = 0; i < destChannelCount; i++)
+                        {
+                            if (i < channelString.size())
+                            {
+                                if (CHANNEL_INDEX_MAP.count(channelString[i]))
+                                {
+                                    size_t index = CHANNEL_INDEX_MAP.at(channelString[i]);
+                                    if (index < origValueTokens.size())
+                                    {
+                                        newValueTokens.push_back(origValueTokens[index]);
+                                    }
+                                }
+                                else if (CHANNEL_CONSTANT_MAP.count(channelString[i]))
+                                {
+                                    newValueTokens.push_back(std::to_string(CHANNEL_CONSTANT_MAP.at(channelString[i])));
+                                }
+                                else
+                                {
+                                    newValueTokens.push_back(origValueTokens[0]);
+                                }
+                            }
+                            else
+                            {
+                                newValueTokens.push_back(origValueTokens[0]);
+                            }
+                        }
+                        InputPtr valueInput = node->addInput("value", node->getType());
+                        valueInput->setValueString(joinStrings(newValueTokens, ", "));
+                        node->removeInput(inInput->getName());
+                    }
+                    else if (destChannelCount == 1)
+                    {
+                        // Replace swizzle with extract.
+                        node->setCategory("extract");
+                        if (!channelString.empty() && CHANNEL_INDEX_MAP.count(channelString[0]))
+                        {
+                            node->setInputValue("index", (int) CHANNEL_INDEX_MAP.at(channelString[0]));
+                        }
+                    }
+                    else if (CHANNEL_CONVERT_PATTERNS.count(channelString))
+                    {
+                        // Replace swizzle with convert.
+                        node->setCategory("convert");
+                    }
+                    else
+                    {
+                        // Replace swizzle with separate and combine.
+                        GraphElementPtr parent = node->getParent()->asA<GraphElement>();
+                        NodePtr separateNode = parent->addNode(std::string("separate") + std::to_string(sourceChannelCount), EMPTY_STRING, MULTI_OUTPUT_TYPE_STRING);
+                        node->setCategory("combine" + std::to_string(destChannelCount));
+                        for (size_t i = 0; i < destChannelCount; i++)
+                        {
+                            InputPtr combineInInput = node->addInput(std::string("in") + std::to_string(i + 1), "float");
+                            if (i < channelString.size())
+                            {
+                                if (CHANNEL_INDEX_MAP.count(channelString[i]))
+                                {
+                                    combineInInput->setConnectedNode(separateNode);
+                                    combineInInput->setOutputString(std::string("out") + channelString[i]);
+                                }
+                                else if (CHANNEL_CONSTANT_MAP.count(channelString[i]))
+                                {
+                                    combineInInput->setValue(CHANNEL_CONSTANT_MAP.at(channelString[i]));
+                                }
+                            }
+                            else
+                            {
+                                combineInInput->setConnectedNode(separateNode);
+                                combineInInput->setOutputString(combineInInput->isColorType() ? "outr" : "outx");
+                            }
+                        }
+                        InputPtr separateInInput = separateNode->addInput("in");
+                        separateInInput->copyContentFrom(inInput);
+                        node->removeInput(inInput->getName());
+                    }
+
+                    // Remove the channels input from the converted node.
+                    if (channelsInput)
+                    {
+                        node->removeInput(channelsInput->getName());
+                    }
+                }
+            }
             else if (nodeCategory == "atan2")
             {
                 InputPtr input1 = node->getInput("in1");
@@ -1097,10 +1218,6 @@ void Document::upgradeVersion()
             }
         }
 
-        // During the development of 1.39, we remove unsupported nodedefs at runtime, and this
-        // change should be applied to the MaterialX data libraries before the release of 1.39.
-        removeNodeDef("ND_thin_film_bsdf");
-
         minorVersion = 39;
     }