From c105509f2b9cc33b90ea8719e9cf0fcea2699214 Mon Sep 17 00:00:00 2001
From: Bernard Kwok <kwokcb@gmail.com>
Date: Thu, 18 Jan 2024 17:09:08 -0500
Subject: [PATCH] Merge update. (#48)

* Improvements to noise implementations (#1653)

- Leverage node graphs to share the conversion aspects of noise implementations across languages.
- Simplify noise unit tests to cover only unique implementations.

* Fix shader generation typos

This changelist fixes a handful of minor typos in shader generation, introduced in #1355 and #1553.

* Add frame capture to web viewer (#1636)

Add frame capture code to trigger on 'f' key. This is the same key as used for the desktop viewer.

* Document format updates

This changelist applies the mxformat.py script to the libraries and resources folders in the repository, updating formatting for a handful of documents.

---------

Co-authored-by: Jonathan Stone <jstone@lucasfilm.com>
---
 javascript/MaterialXView/source/index.js      |  30 ++-
 libraries/bxdf/gltf_pbr.mtlx                  |   2 +-
 .../nprlib/genglsl/nprlib_genglsl_impl.mtlx   |   2 +-
 .../nprlib/genmdl/nprlib_genmdl_impl.mtlx     |   2 +-
 .../nprlib/genmsl/nprlib_genmsl_impl.mtlx     |   2 +-
 .../genglsl/mx_fractal3d_fa_vector2.glsl      |   7 -
 .../genglsl/mx_fractal3d_fa_vector3.glsl      |   7 -
 .../genglsl/mx_fractal3d_fa_vector4.glsl      |   7 -
 .../stdlib/genglsl/mx_noise2d_fa_vector2.glsl |   7 -
 .../stdlib/genglsl/mx_noise2d_fa_vector3.glsl |   7 -
 .../stdlib/genglsl/mx_noise2d_fa_vector4.glsl |   8 -
 .../stdlib/genglsl/mx_noise3d_fa_vector2.glsl |   7 -
 .../stdlib/genglsl/mx_noise3d_fa_vector3.glsl |   7 -
 .../stdlib/genglsl/mx_noise3d_fa_vector4.glsl |   8 -
 .../stdlib/genglsl/stdlib_genglsl_impl.mtlx   |  21 --
 .../stdlib/genmdl/stdlib_genmdl_impl.mtlx     |  21 --
 .../stdlib/genmsl/stdlib_genmsl_impl.mtlx     |  27 +--
 libraries/stdlib/genosl/mx_creatematrix.osl   |   6 +-
 .../stdlib/genosl/mx_fractal3d_color3.osl     |   5 -
 .../stdlib/genosl/mx_fractal3d_color4.osl     |   5 -
 .../stdlib/genosl/mx_fractal3d_fa_color3.osl  |   5 -
 .../stdlib/genosl/mx_fractal3d_fa_color4.osl  |   5 -
 .../stdlib/genosl/mx_fractal3d_fa_vector2.osl |   5 -
 .../stdlib/genosl/mx_fractal3d_fa_vector3.osl |   5 -
 .../stdlib/genosl/mx_fractal3d_fa_vector4.osl |   5 -
 libraries/stdlib/genosl/mx_noise2d_color3.osl |   5 -
 libraries/stdlib/genosl/mx_noise2d_color4.osl |   5 -
 .../stdlib/genosl/mx_noise2d_fa_color3.osl    |   5 -
 .../stdlib/genosl/mx_noise2d_fa_color4.osl    |   5 -
 .../stdlib/genosl/mx_noise2d_fa_vector2.osl   |   5 -
 .../stdlib/genosl/mx_noise2d_fa_vector3.osl   |   5 -
 .../stdlib/genosl/mx_noise2d_fa_vector4.osl   |   5 -
 libraries/stdlib/genosl/mx_noise3d_color3.osl |   5 -
 libraries/stdlib/genosl/mx_noise3d_color4.osl |   5 -
 .../stdlib/genosl/mx_noise3d_fa_color3.osl    |   5 -
 .../stdlib/genosl/mx_noise3d_fa_color4.osl    |   5 -
 .../stdlib/genosl/mx_noise3d_fa_vector2.osl   |   5 -
 .../stdlib/genosl/mx_noise3d_fa_vector3.osl   |   5 -
 .../stdlib/genosl/mx_noise3d_fa_vector4.osl   |   5 -
 libraries/stdlib/genosl/mx_normalmap.osl      |   2 +-
 .../stdlib/genosl/stdlib_genosl_impl.mtlx     |  27 +--
 libraries/stdlib/stdlib_ng.mtlx               | 200 +++++++++++++++++-
 .../TestSuite/stdlib/noise/noise.mtlx         | 105 ---------
 .../stdlib/procedural/tiledshape.mtlx         |   2 +-
 .../TestSuite/stdlib/upgrade/syntax_1_37.mtlx |   2 +-
 45 files changed, 241 insertions(+), 380 deletions(-)
 delete mode 100644 libraries/stdlib/genglsl/mx_fractal3d_fa_vector2.glsl
 delete mode 100644 libraries/stdlib/genglsl/mx_fractal3d_fa_vector3.glsl
 delete mode 100644 libraries/stdlib/genglsl/mx_fractal3d_fa_vector4.glsl
 delete mode 100644 libraries/stdlib/genglsl/mx_noise2d_fa_vector2.glsl
 delete mode 100644 libraries/stdlib/genglsl/mx_noise2d_fa_vector3.glsl
 delete mode 100644 libraries/stdlib/genglsl/mx_noise2d_fa_vector4.glsl
 delete mode 100644 libraries/stdlib/genglsl/mx_noise3d_fa_vector2.glsl
 delete mode 100644 libraries/stdlib/genglsl/mx_noise3d_fa_vector3.glsl
 delete mode 100644 libraries/stdlib/genglsl/mx_noise3d_fa_vector4.glsl
 delete mode 100644 libraries/stdlib/genosl/mx_fractal3d_color3.osl
 delete mode 100644 libraries/stdlib/genosl/mx_fractal3d_color4.osl
 delete mode 100644 libraries/stdlib/genosl/mx_fractal3d_fa_color3.osl
 delete mode 100644 libraries/stdlib/genosl/mx_fractal3d_fa_color4.osl
 delete mode 100644 libraries/stdlib/genosl/mx_fractal3d_fa_vector2.osl
 delete mode 100644 libraries/stdlib/genosl/mx_fractal3d_fa_vector3.osl
 delete mode 100644 libraries/stdlib/genosl/mx_fractal3d_fa_vector4.osl
 delete mode 100644 libraries/stdlib/genosl/mx_noise2d_color3.osl
 delete mode 100644 libraries/stdlib/genosl/mx_noise2d_color4.osl
 delete mode 100644 libraries/stdlib/genosl/mx_noise2d_fa_color3.osl
 delete mode 100644 libraries/stdlib/genosl/mx_noise2d_fa_color4.osl
 delete mode 100644 libraries/stdlib/genosl/mx_noise2d_fa_vector2.osl
 delete mode 100644 libraries/stdlib/genosl/mx_noise2d_fa_vector3.osl
 delete mode 100644 libraries/stdlib/genosl/mx_noise2d_fa_vector4.osl
 delete mode 100644 libraries/stdlib/genosl/mx_noise3d_color3.osl
 delete mode 100644 libraries/stdlib/genosl/mx_noise3d_color4.osl
 delete mode 100644 libraries/stdlib/genosl/mx_noise3d_fa_color3.osl
 delete mode 100644 libraries/stdlib/genosl/mx_noise3d_fa_color4.osl
 delete mode 100644 libraries/stdlib/genosl/mx_noise3d_fa_vector2.osl
 delete mode 100644 libraries/stdlib/genosl/mx_noise3d_fa_vector3.osl
 delete mode 100644 libraries/stdlib/genosl/mx_noise3d_fa_vector4.osl

diff --git a/javascript/MaterialXView/source/index.js b/javascript/MaterialXView/source/index.js
index d11ba9691e..d46bd2350f 100644
--- a/javascript/MaterialXView/source/index.js
+++ b/javascript/MaterialXView/source/index.js
@@ -21,6 +21,8 @@ let turntableEnabled = false;
 let turntableSteps = 360;
 let turntableStep = 0;
 
+let captureRequested = false;
+
 // Get URL options. Fallback to defaults if not specified.
 let materialFilename = new URLSearchParams(document.location.search).get("file");
 if (!materialFilename) {
@@ -31,6 +33,18 @@ let viewer = Viewer.create();
 init();
 viewer.getEditor().updateProperties(0.9);
 
+// Capture the current frame and save an image file.
+function captureFrame()
+{
+    let canvas = document.getElementById('webglcanvas');
+    var url = canvas.toDataURL();    
+    var link = document.createElement('a');
+    link.setAttribute('href', url);
+    link.setAttribute('target', '_blank');
+    link.setAttribute('download', 'screenshot.png');
+    link.click();
+}
+
 function init() 
 {
     let canvas = document.getElementById('webglcanvas');
@@ -82,9 +96,15 @@ function init()
     orbitControls = new OrbitControls(scene.getCamera(), renderer.domElement);
     orbitControls.addEventListener('change', () => {
         viewer.getScene().setUpdateTransforms();
-    })  
+    })
 
-    // Load model and shaders
+    // Add hotkey 'f' to capture the current frame and save an image file.
+    // See check inside the render loop when a capture can be performed.
+    document.addEventListener('keydown', (event) => {
+        if (event.key === 'f') {
+            captureRequested = true;
+        }
+    });
 
     // Initialize editor
     viewer.getEditor().initialize();
@@ -160,6 +180,12 @@ function animate()
 
     composer.render();
     viewer.getScene().updateTransforms();
+
+    if (captureRequested)
+    {
+        captureFrame();
+        captureRequested = false;
+    }
 }
 
 function handleKeyEvents(event)
diff --git a/libraries/bxdf/gltf_pbr.mtlx b/libraries/bxdf/gltf_pbr.mtlx
index 6654e63454..b42054a185 100644
--- a/libraries/bxdf/gltf_pbr.mtlx
+++ b/libraries/bxdf/gltf_pbr.mtlx
@@ -359,7 +359,7 @@
   <nodedef name="ND_gltf_colorimage" node="gltf_colorimage" version="1.0" isdefaultversion="true" nodegroup="texture2d">
     <input name="file" type="filename" uniform="true" value="" uifolder="Image" />
     <input name="default" type="color4" value="0, 0, 0, 0" uifolder="Image" />
-    <input name="texcoord" type="vector2" defaultgeomprop="UV0" uifolder="Image"/>
+    <input name="texcoord" type="vector2" defaultgeomprop="UV0" uifolder="Image" />
     <input name="pivot" type="vector2" value="0, 1" uifolder="Image" />
     <input name="scale" type="vector2" value="1, 1" uifolder="Image" />
     <input name="rotate" type="float" value="0" unit="degree" unittype="angle" uimin="0" uimax="360" uifolder="Image" />
diff --git a/libraries/nprlib/genglsl/nprlib_genglsl_impl.mtlx b/libraries/nprlib/genglsl/nprlib_genglsl_impl.mtlx
index 7ddc4cee83..1a96f315e5 100644
--- a/libraries/nprlib/genglsl/nprlib_genglsl_impl.mtlx
+++ b/libraries/nprlib/genglsl/nprlib_genglsl_impl.mtlx
@@ -12,6 +12,6 @@
   <!-- ======================================================================== -->
 
   <!-- <viewdirection> -->
-  <implementation name="IM_viewdirection_vector3_genglsl" nodedef="ND_viewdirection_vector3" target="genglsl"/>
+  <implementation name="IM_viewdirection_vector3_genglsl" nodedef="ND_viewdirection_vector3" target="genglsl" />
 
 </materialx>
diff --git a/libraries/nprlib/genmdl/nprlib_genmdl_impl.mtlx b/libraries/nprlib/genmdl/nprlib_genmdl_impl.mtlx
index b6472e0c51..73a9d22945 100644
--- a/libraries/nprlib/genmdl/nprlib_genmdl_impl.mtlx
+++ b/libraries/nprlib/genmdl/nprlib_genmdl_impl.mtlx
@@ -12,6 +12,6 @@
   <!-- ======================================================================== -->
 
   <!-- <viewdirection> -->
-  <implementation name="IM_viewdirection_vector3_genmdl" nodedef="ND_viewdirection_vector3" sourcecode="mx::stdlib::mx_viewdirection_vector3()" target="genmdl"/>
+  <implementation name="IM_viewdirection_vector3_genmdl" nodedef="ND_viewdirection_vector3" sourcecode="mx::stdlib::mx_viewdirection_vector3()" target="genmdl" />
 
 </materialx>
diff --git a/libraries/nprlib/genmsl/nprlib_genmsl_impl.mtlx b/libraries/nprlib/genmsl/nprlib_genmsl_impl.mtlx
index b8f9a4e3aa..615e9d8ce0 100644
--- a/libraries/nprlib/genmsl/nprlib_genmsl_impl.mtlx
+++ b/libraries/nprlib/genmsl/nprlib_genmsl_impl.mtlx
@@ -12,6 +12,6 @@
   <!-- ======================================================================== -->
 
   <!-- <viewdirection> -->
-  <implementation name="IM_viewdirection_vector3_genmsl" nodedef="ND_viewdirection_vector3" target="genmsl"/>
+  <implementation name="IM_viewdirection_vector3_genmsl" nodedef="ND_viewdirection_vector3" target="genmsl" />
 
 </materialx>
diff --git a/libraries/stdlib/genglsl/mx_fractal3d_fa_vector2.glsl b/libraries/stdlib/genglsl/mx_fractal3d_fa_vector2.glsl
deleted file mode 100644
index 59dbbee127..0000000000
--- a/libraries/stdlib/genglsl/mx_fractal3d_fa_vector2.glsl
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "lib/mx_noise.glsl"
-
-void mx_fractal3d_fa_vector2(float amplitude, int octaves, float lacunarity, float diminish, vec3 position, out vec2 result)
-{
-    vec2 value = mx_fractal_noise_vec2(position, octaves, lacunarity, diminish);
-    result = value * amplitude;
-}
diff --git a/libraries/stdlib/genglsl/mx_fractal3d_fa_vector3.glsl b/libraries/stdlib/genglsl/mx_fractal3d_fa_vector3.glsl
deleted file mode 100644
index d0f30defd4..0000000000
--- a/libraries/stdlib/genglsl/mx_fractal3d_fa_vector3.glsl
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "lib/mx_noise.glsl"
-
-void mx_fractal3d_fa_vector3(float amplitude, int octaves, float lacunarity, float diminish, vec3 position, out vec3 result)
-{
-    vec3 value = mx_fractal_noise_vec3(position, octaves, lacunarity, diminish);
-    result = value * amplitude;
-}
diff --git a/libraries/stdlib/genglsl/mx_fractal3d_fa_vector4.glsl b/libraries/stdlib/genglsl/mx_fractal3d_fa_vector4.glsl
deleted file mode 100644
index b9c66c4465..0000000000
--- a/libraries/stdlib/genglsl/mx_fractal3d_fa_vector4.glsl
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "lib/mx_noise.glsl"
-
-void mx_fractal3d_fa_vector4(float amplitude, int octaves, float lacunarity, float diminish, vec3 position, out vec4 result)
-{
-    vec4 value = mx_fractal_noise_vec4(position, octaves, lacunarity, diminish);
-    result = value * amplitude;
-}
diff --git a/libraries/stdlib/genglsl/mx_noise2d_fa_vector2.glsl b/libraries/stdlib/genglsl/mx_noise2d_fa_vector2.glsl
deleted file mode 100644
index f5a81565d7..0000000000
--- a/libraries/stdlib/genglsl/mx_noise2d_fa_vector2.glsl
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "lib/mx_noise.glsl"
-
-void mx_noise2d_fa_vector2(float amplitude, float pivot, vec2 texcoord, out vec2 result)
-{
-    vec3 value = mx_perlin_noise_vec3(texcoord);
-    result = value.xy * amplitude + pivot;
-}
diff --git a/libraries/stdlib/genglsl/mx_noise2d_fa_vector3.glsl b/libraries/stdlib/genglsl/mx_noise2d_fa_vector3.glsl
deleted file mode 100644
index 0735965ca0..0000000000
--- a/libraries/stdlib/genglsl/mx_noise2d_fa_vector3.glsl
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "lib/mx_noise.glsl"
-
-void mx_noise2d_fa_vector3(float amplitude, float pivot, vec2 texcoord, out vec3 result)
-{
-    vec3 value = mx_perlin_noise_vec3(texcoord);
-    result = value * amplitude + pivot;
-}
diff --git a/libraries/stdlib/genglsl/mx_noise2d_fa_vector4.glsl b/libraries/stdlib/genglsl/mx_noise2d_fa_vector4.glsl
deleted file mode 100644
index 6d51a59e4a..0000000000
--- a/libraries/stdlib/genglsl/mx_noise2d_fa_vector4.glsl
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "lib/mx_noise.glsl"
-
-void mx_noise2d_fa_vector4(float amplitude, float pivot, vec2 texcoord, out vec4 result)
-{
-    vec3 xyz = mx_perlin_noise_vec3(texcoord);
-    float w = mx_perlin_noise_float(texcoord + vec2(19, 73));
-    result = vec4(xyz, w) * amplitude + pivot;
-}
diff --git a/libraries/stdlib/genglsl/mx_noise3d_fa_vector2.glsl b/libraries/stdlib/genglsl/mx_noise3d_fa_vector2.glsl
deleted file mode 100644
index 06d91f9135..0000000000
--- a/libraries/stdlib/genglsl/mx_noise3d_fa_vector2.glsl
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "lib/mx_noise.glsl"
-
-void mx_noise3d_fa_vector2(float amplitude, float pivot, vec3 position, out vec2 result)
-{
-    vec3 value = mx_perlin_noise_vec3(position);
-    result = value.xy * amplitude + pivot;
-}
diff --git a/libraries/stdlib/genglsl/mx_noise3d_fa_vector3.glsl b/libraries/stdlib/genglsl/mx_noise3d_fa_vector3.glsl
deleted file mode 100644
index 168bf572f1..0000000000
--- a/libraries/stdlib/genglsl/mx_noise3d_fa_vector3.glsl
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "lib/mx_noise.glsl"
-
-void mx_noise3d_fa_vector3(float amplitude, float pivot, vec3 position, out vec3 result)
-{
-    vec3 value = mx_perlin_noise_vec3(position);
-    result = value * amplitude + pivot;
-}
diff --git a/libraries/stdlib/genglsl/mx_noise3d_fa_vector4.glsl b/libraries/stdlib/genglsl/mx_noise3d_fa_vector4.glsl
deleted file mode 100644
index 680410f9d3..0000000000
--- a/libraries/stdlib/genglsl/mx_noise3d_fa_vector4.glsl
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "lib/mx_noise.glsl"
-
-void mx_noise3d_fa_vector4(float amplitude, float pivot, vec3 position, out vec4 result)
-{
-    vec3 xyz = mx_perlin_noise_vec3(position);
-    float w = mx_perlin_noise_float(position + vec3(19, 73, 29));
-    result = vec4(xyz, w) * amplitude + pivot;
-}
diff --git a/libraries/stdlib/genglsl/stdlib_genglsl_impl.mtlx b/libraries/stdlib/genglsl/stdlib_genglsl_impl.mtlx
index dc4f52e3b6..3cd3ae305d 100644
--- a/libraries/stdlib/genglsl/stdlib_genglsl_impl.mtlx
+++ b/libraries/stdlib/genglsl/stdlib_genglsl_impl.mtlx
@@ -98,42 +98,21 @@
 
   <!-- <noise2d> -->
   <implementation name="IM_noise2d_float_genglsl" nodedef="ND_noise2d_float" file="mx_noise2d_float.glsl" function="mx_noise2d_float" target="genglsl" />
-  <implementation name="IM_noise2d_color3_genglsl" nodedef="ND_noise2d_color3" file="mx_noise2d_vector3.glsl" function="mx_noise2d_vector3" target="genglsl" />
-  <implementation name="IM_noise2d_color4_genglsl" nodedef="ND_noise2d_color4" file="mx_noise2d_vector4.glsl" function="mx_noise2d_vector4" target="genglsl" />
-  <implementation name="IM_noise2d_color3FA_genglsl" nodedef="ND_noise2d_color3FA" file="mx_noise2d_fa_vector3.glsl" function="mx_noise2d_fa_vector3" target="genglsl" />
-  <implementation name="IM_noise2d_color4FA_genglsl" nodedef="ND_noise2d_color4FA" file="mx_noise2d_fa_vector4.glsl" function="mx_noise2d_fa_vector4" target="genglsl" />
   <implementation name="IM_noise2d_vector2_genglsl" nodedef="ND_noise2d_vector2" file="mx_noise2d_vector2.glsl" function="mx_noise2d_vector2" target="genglsl" />
   <implementation name="IM_noise2d_vector3_genglsl" nodedef="ND_noise2d_vector3" file="mx_noise2d_vector3.glsl" function="mx_noise2d_vector3" target="genglsl" />
   <implementation name="IM_noise2d_vector4_genglsl" nodedef="ND_noise2d_vector4" file="mx_noise2d_vector4.glsl" function="mx_noise2d_vector4" target="genglsl" />
-  <implementation name="IM_noise2d_vector2FA_genglsl" nodedef="ND_noise2d_vector2FA" file="mx_noise2d_fa_vector2.glsl" function="mx_noise2d_fa_vector2" target="genglsl" />
-  <implementation name="IM_noise2d_vector3FA_genglsl" nodedef="ND_noise2d_vector3FA" file="mx_noise2d_fa_vector3.glsl" function="mx_noise2d_fa_vector3" target="genglsl" />
-  <implementation name="IM_noise2d_vector4FA_genglsl" nodedef="ND_noise2d_vector4FA" file="mx_noise2d_fa_vector4.glsl" function="mx_noise2d_fa_vector4" target="genglsl" />
 
   <!-- <noise3d> -->
   <implementation name="IM_noise3d_float_genglsl" nodedef="ND_noise3d_float" file="mx_noise3d_float.glsl" function="mx_noise3d_float" target="genglsl" />
-  <implementation name="IM_noise3d_color3_genglsl" nodedef="ND_noise3d_color3" file="mx_noise3d_vector3.glsl" function="mx_noise3d_vector3" target="genglsl" />
-  <implementation name="IM_noise3d_color4_genglsl" nodedef="ND_noise3d_color4" file="mx_noise3d_vector4.glsl" function="mx_noise3d_vector4" target="genglsl" />
-  <implementation name="IM_noise3d_color3FA_genglsl" nodedef="ND_noise3d_color3FA" file="mx_noise3d_fa_vector3.glsl" function="mx_noise3d_fa_vector3" target="genglsl" />
-  <implementation name="IM_noise3d_color4FA_genglsl" nodedef="ND_noise3d_color4FA" file="mx_noise3d_fa_vector4.glsl" function="mx_noise3d_fa_vector4" target="genglsl" />
   <implementation name="IM_noise3d_vector2_genglsl" nodedef="ND_noise3d_vector2" file="mx_noise3d_vector2.glsl" function="mx_noise3d_vector2" target="genglsl" />
   <implementation name="IM_noise3d_vector3_genglsl" nodedef="ND_noise3d_vector3" file="mx_noise3d_vector3.glsl" function="mx_noise3d_vector3" target="genglsl" />
   <implementation name="IM_noise3d_vector4_genglsl" nodedef="ND_noise3d_vector4" file="mx_noise3d_vector4.glsl" function="mx_noise3d_vector4" target="genglsl" />
-  <implementation name="IM_noise3d_vector2FA_genglsl" nodedef="ND_noise3d_vector2FA" file="mx_noise3d_fa_vector2.glsl" function="mx_noise3d_fa_vector2" target="genglsl" />
-  <implementation name="IM_noise3d_vector3FA_genglsl" nodedef="ND_noise3d_vector3FA" file="mx_noise3d_fa_vector3.glsl" function="mx_noise3d_fa_vector3" target="genglsl" />
-  <implementation name="IM_noise3d_vector4FA_genglsl" nodedef="ND_noise3d_vector4FA" file="mx_noise3d_fa_vector4.glsl" function="mx_noise3d_fa_vector4" target="genglsl" />
 
   <!-- <fractal3d> -->
   <implementation name="IM_fractal3d_float_genglsl" nodedef="ND_fractal3d_float" file="mx_fractal3d_float.glsl" function="mx_fractal3d_float" target="genglsl" />
-  <implementation name="IM_fractal3d_color3_genglsl" nodedef="ND_fractal3d_color3" file="mx_fractal3d_vector3.glsl" function="mx_fractal3d_vector3" target="genglsl" />
-  <implementation name="IM_fractal3d_color4_genglsl" nodedef="ND_fractal3d_color4" file="mx_fractal3d_vector4.glsl" function="mx_fractal3d_vector4" target="genglsl" />
-  <implementation name="IM_fractal3d_color3FA_genglsl" nodedef="ND_fractal3d_color3FA" file="mx_fractal3d_fa_vector3.glsl" function="mx_fractal3d_fa_vector3" target="genglsl" />
-  <implementation name="IM_fractal3d_color4FA_genglsl" nodedef="ND_fractal3d_color4FA" file="mx_fractal3d_fa_vector4.glsl" function="mx_fractal3d_fa_vector4" target="genglsl" />
   <implementation name="IM_fractal3d_vector2_genglsl" nodedef="ND_fractal3d_vector2" file="mx_fractal3d_vector2.glsl" function="mx_fractal3d_vector2" target="genglsl" />
   <implementation name="IM_fractal3d_vector3_genglsl" nodedef="ND_fractal3d_vector3" file="mx_fractal3d_vector3.glsl" function="mx_fractal3d_vector3" target="genglsl" />
   <implementation name="IM_fractal3d_vector4_genglsl" nodedef="ND_fractal3d_vector4" file="mx_fractal3d_vector4.glsl" function="mx_fractal3d_vector4" target="genglsl" />
-  <implementation name="IM_fractal3d_vector2FA_genglsl" nodedef="ND_fractal3d_vector2FA" file="mx_fractal3d_fa_vector2.glsl" function="mx_fractal3d_fa_vector2" target="genglsl" />
-  <implementation name="IM_fractal3d_vector3FA_genglsl" nodedef="ND_fractal3d_vector3FA" file="mx_fractal3d_fa_vector3.glsl" function="mx_fractal3d_fa_vector3" target="genglsl" />
-  <implementation name="IM_fractal3d_vector4FA_genglsl" nodedef="ND_fractal3d_vector4FA" file="mx_fractal3d_fa_vector4.glsl" function="mx_fractal3d_fa_vector4" target="genglsl" />
 
   <!-- <cellnoise2d> -->
   <implementation name="IM_cellnoise2d_float_genglsl" nodedef="ND_cellnoise2d_float" file="mx_cellnoise2d_float.glsl" function="mx_cellnoise2d_float" target="genglsl" />
diff --git a/libraries/stdlib/genmdl/stdlib_genmdl_impl.mtlx b/libraries/stdlib/genmdl/stdlib_genmdl_impl.mtlx
index 96fd768e25..5250501320 100644
--- a/libraries/stdlib/genmdl/stdlib_genmdl_impl.mtlx
+++ b/libraries/stdlib/genmdl/stdlib_genmdl_impl.mtlx
@@ -99,42 +99,21 @@
 
   <!-- <noise2d> -->
   <implementation name="IM_noise2d_float_genmdl" nodedef="ND_noise2d_float" sourcecode="mx::stdlib::mx_noise2d_float(mxp_amplitude:{{amplitude}}, mxp_pivot:{{pivot}}, mxp_texcoord:{{texcoord}})" target="genmdl" />
-  <implementation name="IM_noise2d_color3_genmdl" nodedef="ND_noise2d_color3" sourcecode="mx::stdlib::mx_noise2d_color3(mxp_amplitude:{{amplitude}}, mxp_pivot:{{pivot}}, mxp_texcoord:{{texcoord}})" target="genmdl" />
-  <implementation name="IM_noise2d_color4_genmdl" nodedef="ND_noise2d_color4" sourcecode="mx::stdlib::mx_noise2d_color4(mxp_amplitude:{{amplitude}}, mxp_pivot:{{pivot}}, mxp_texcoord:{{texcoord}})" target="genmdl" />
   <implementation name="IM_noise2d_vector2_genmdl" nodedef="ND_noise2d_vector2" sourcecode="mx::stdlib::mx_noise2d_float2(mxp_amplitude:{{amplitude}}, mxp_pivot:{{pivot}}, mxp_texcoord:{{texcoord}})" target="genmdl" />
   <implementation name="IM_noise2d_vector3_genmdl" nodedef="ND_noise2d_vector3" sourcecode="mx::stdlib::mx_noise2d_float3(mxp_amplitude:{{amplitude}}, mxp_pivot:{{pivot}}, mxp_texcoord:{{texcoord}})" target="genmdl" />
   <implementation name="IM_noise2d_vector4_genmdl" nodedef="ND_noise2d_vector4" sourcecode="mx::stdlib::mx_noise2d_float4(mxp_amplitude:{{amplitude}}, mxp_pivot:{{pivot}}, mxp_texcoord:{{texcoord}})" target="genmdl" />
-  <implementation name="IM_noise2d_color3FA_genmdl" nodedef="ND_noise2d_color3FA" sourcecode="mx::stdlib::mx_noise2d_color3FA(mxp_amplitude:{{amplitude}}, mxp_pivot:{{pivot}}, mxp_texcoord:{{texcoord}})" target="genmdl" />
-  <implementation name="IM_noise2d_color4FA_genmdl" nodedef="ND_noise2d_color4FA" sourcecode="mx::stdlib::mx_noise2d_color4FA(mxp_amplitude:{{amplitude}}, mxp_pivot:{{pivot}}, mxp_texcoord:{{texcoord}})" target="genmdl" />
-  <implementation name="IM_noise2d_vector2FA_genmdl" nodedef="ND_noise2d_vector2FA" sourcecode="mx::stdlib::mx_noise2d_float2FA(mxp_amplitude:{{amplitude}}, mxp_pivot:{{pivot}}, mxp_texcoord:{{texcoord}})" target="genmdl" />
-  <implementation name="IM_noise2d_vector3FA_genmdl" nodedef="ND_noise2d_vector3FA" sourcecode="mx::stdlib::mx_noise2d_float3FA(mxp_amplitude:{{amplitude}}, mxp_pivot:{{pivot}}, mxp_texcoord:{{texcoord}})" target="genmdl" />
-  <implementation name="IM_noise2d_vector4FA_genmdl" nodedef="ND_noise2d_vector4FA" sourcecode="mx::stdlib::mx_noise2d_float4FA(mxp_amplitude:{{amplitude}}, mxp_pivot:{{pivot}}, mxp_texcoord:{{texcoord}})" target="genmdl" />
 
   <!-- <noise3d> -->
   <implementation name="IM_noise3d_float_genmdl" nodedef="ND_noise3d_float" sourcecode="mx::stdlib::mx_noise3d_float(mxp_amplitude:{{amplitude}}, mxp_pivot:{{pivot}}, mxp_position:{{position}})" target="genmdl" />
-  <implementation name="IM_noise3d_color3_genmdl" nodedef="ND_noise3d_color3" sourcecode="mx::stdlib::mx_noise3d_color3(mxp_amplitude:{{amplitude}}, mxp_pivot:{{pivot}}, mxp_position:{{position}})" target="genmdl" />
-  <implementation name="IM_noise3d_color4_genmdl" nodedef="ND_noise3d_color4" sourcecode="mx::stdlib::mx_noise3d_color4(mxp_amplitude:{{amplitude}}, mxp_pivot:{{pivot}}, mxp_position:{{position}})" target="genmdl" />
   <implementation name="IM_noise3d_vector2_genmdl" nodedef="ND_noise3d_vector2" sourcecode="mx::stdlib::mx_noise3d_float2(mxp_amplitude:{{amplitude}}, mxp_pivot:{{pivot}}, mxp_position:{{position}})" target="genmdl" />
   <implementation name="IM_noise3d_vector3_genmdl" nodedef="ND_noise3d_vector3" sourcecode="mx::stdlib::mx_noise3d_float3(mxp_amplitude:{{amplitude}}, mxp_pivot:{{pivot}}, mxp_position:{{position}})" target="genmdl" />
   <implementation name="IM_noise3d_vector4_genmdl" nodedef="ND_noise3d_vector4" sourcecode="mx::stdlib::mx_noise3d_float4(mxp_amplitude:{{amplitude}}, mxp_pivot:{{pivot}}, mxp_position:{{position}})" target="genmdl" />
-  <implementation name="IM_noise3d_color3FA_genmdl" nodedef="ND_noise3d_color3FA" sourcecode="mx::stdlib::mx_noise3d_color3FA(mxp_amplitude:{{amplitude}}, mxp_pivot:{{pivot}}, mxp_position:{{position}})" target="genmdl" />
-  <implementation name="IM_noise3d_color4FA_genmdl" nodedef="ND_noise3d_color4FA" sourcecode="mx::stdlib::mx_noise3d_color4FA(mxp_amplitude:{{amplitude}}, mxp_pivot:{{pivot}}, mxp_position:{{position}})" target="genmdl" />
-  <implementation name="IM_noise3d_vector2FA_genmdl" nodedef="ND_noise3d_vector2FA" sourcecode="mx::stdlib::mx_noise3d_float2FA(mxp_amplitude:{{amplitude}}, mxp_pivot:{{pivot}}, mxp_position:{{position}})" target="genmdl" />
-  <implementation name="IM_noise3d_vector3FA_genmdl" nodedef="ND_noise3d_vector3FA" sourcecode="mx::stdlib::mx_noise3d_float3FA(mxp_amplitude:{{amplitude}}, mxp_pivot:{{pivot}}, mxp_position:{{position}})" target="genmdl" />
-  <implementation name="IM_noise3d_vector4FA_genmdl" nodedef="ND_noise3d_vector4FA" sourcecode="mx::stdlib::mx_noise3d_float4FA(mxp_amplitude:{{amplitude}}, mxp_pivot:{{pivot}}, mxp_position:{{position}})" target="genmdl" />
 
   <!-- <fractal3d> -->
   <implementation name="IM_fractal3d_float_genmdl" nodedef="ND_fractal3d_float" sourcecode="mx::stdlib::mx_fractal3d_float(mxp_amplitude:{{amplitude}}, mxp_octaves:{{octaves}}, mxp_lacunarity:{{lacunarity}}, mxp_diminish:{{diminish}}, mxp_position:{{position}})" target="genmdl" />
-  <implementation name="IM_fractal3d_color3_genmdl" nodedef="ND_fractal3d_color3" sourcecode="mx::stdlib::mx_fractal3d_color3(mxp_amplitude:{{amplitude}}, mxp_octaves:{{octaves}}, mxp_lacunarity:{{lacunarity}}, mxp_diminish:{{diminish}}, mxp_position:{{position}})" target="genmdl" />
-  <implementation name="IM_fractal3d_color4_genmdl" nodedef="ND_fractal3d_color4" sourcecode="mx::stdlib::mx_fractal3d_color4(mxp_amplitude:{{amplitude}}, mxp_octaves:{{octaves}}, mxp_lacunarity:{{lacunarity}}, mxp_diminish:{{diminish}}, mxp_position:{{position}})" target="genmdl" />
   <implementation name="IM_fractal3d_vector2_genmdl" nodedef="ND_fractal3d_vector2" sourcecode="mx::stdlib::mx_fractal3d_float2(mxp_amplitude:{{amplitude}}, mxp_octaves:{{octaves}}, mxp_lacunarity:{{lacunarity}}, mxp_diminish:{{diminish}}, mxp_position:{{position}})" target="genmdl" />
   <implementation name="IM_fractal3d_vector3_genmdl" nodedef="ND_fractal3d_vector3" sourcecode="mx::stdlib::mx_fractal3d_float3(mxp_amplitude:{{amplitude}}, mxp_octaves:{{octaves}}, mxp_lacunarity:{{lacunarity}}, mxp_diminish:{{diminish}}, mxp_position:{{position}})" target="genmdl" />
   <implementation name="IM_fractal3d_vector4_genmdl" nodedef="ND_fractal3d_vector4" sourcecode="mx::stdlib::mx_fractal3d_float4(mxp_amplitude:{{amplitude}}, mxp_octaves:{{octaves}}, mxp_lacunarity:{{lacunarity}}, mxp_diminish:{{diminish}}, mxp_position:{{position}})" target="genmdl" />
-  <implementation name="IM_fractal3d_color3FA_genmdl" nodedef="ND_fractal3d_color3FA" sourcecode="mx::stdlib::mx_fractal3d_color3FA(mxp_amplitude:{{amplitude}}, mxp_octaves:{{octaves}}, mxp_lacunarity:{{lacunarity}}, mxp_diminish:{{diminish}}, mxp_position:{{position}})" target="genmdl" />
-  <implementation name="IM_fractal3d_color4FA_genmdl" nodedef="ND_fractal3d_color4FA" sourcecode="mx::stdlib::mx_fractal3d_color4FA(mxp_amplitude:{{amplitude}}, mxp_octaves:{{octaves}}, mxp_lacunarity:{{lacunarity}}, mxp_diminish:{{diminish}}, mxp_position:{{position}})" target="genmdl" />
-  <implementation name="IM_fractal3d_vector2FA_genmdl" nodedef="ND_fractal3d_vector2FA" sourcecode="mx::stdlib::mx_fractal3d_float2FA(mxp_amplitude:{{amplitude}}, mxp_octaves:{{octaves}}, mxp_lacunarity:{{lacunarity}}, mxp_diminish:{{diminish}}, mxp_position:{{position}})" target="genmdl" />
-  <implementation name="IM_fractal3d_vector3FA_genmdl" nodedef="ND_fractal3d_vector3FA" sourcecode="mx::stdlib::mx_fractal3d_float3FA(mxp_amplitude:{{amplitude}}, mxp_octaves:{{octaves}}, mxp_lacunarity:{{lacunarity}}, mxp_diminish:{{diminish}}, mxp_position:{{position}})" target="genmdl" />
-  <implementation name="IM_fractal3d_vector4FA_genmdl" nodedef="ND_fractal3d_vector4FA" sourcecode="mx::stdlib::mx_fractal3d_float4FA(mxp_amplitude:{{amplitude}}, mxp_octaves:{{octaves}}, mxp_lacunarity:{{lacunarity}}, mxp_diminish:{{diminish}}, mxp_position:{{position}})" target="genmdl" />
 
   <!-- <cellnoise2d> -->
   <implementation name="IM_cellnoise2d_float_genmdl" nodedef="ND_cellnoise2d_float" sourcecode="mx::stdlib::mx_cellnoise2d_float(mxp_texcoord:{{texcoord}})" target="genmdl" />
diff --git a/libraries/stdlib/genmsl/stdlib_genmsl_impl.mtlx b/libraries/stdlib/genmsl/stdlib_genmsl_impl.mtlx
index 1875c2b617..8526330d47 100644
--- a/libraries/stdlib/genmsl/stdlib_genmsl_impl.mtlx
+++ b/libraries/stdlib/genmsl/stdlib_genmsl_impl.mtlx
@@ -97,42 +97,21 @@
 
   <!-- <noise2d> -->
   <implementation name="IM_noise2d_float_genmsl" nodedef="ND_noise2d_float" file="../genglsl/mx_noise2d_float.glsl" function="mx_noise2d_float" target="genmsl" />
-  <implementation name="IM_noise2d_color3_genmsl" nodedef="ND_noise2d_color3" file="../genglsl/mx_noise2d_vector3.glsl" function="mx_noise2d_vector3" target="genmsl" />
-  <implementation name="IM_noise2d_color4_genmsl" nodedef="ND_noise2d_color4" file="../genglsl/mx_noise2d_vector4.glsl" function="mx_noise2d_vector4" target="genmsl" />
-  <implementation name="IM_noise2d_color3FA_genmsl" nodedef="ND_noise2d_color3FA" file="../genglsl/mx_noise2d_fa_vector3.glsl" function="mx_noise2d_fa_vector3" target="genmsl" />
-  <implementation name="IM_noise2d_color4FA_genmsl" nodedef="ND_noise2d_color4FA" file="../genglsl/mx_noise2d_fa_vector4.glsl" function="mx_noise2d_fa_vector4" target="genmsl" />
   <implementation name="IM_noise2d_vector2_genmsl" nodedef="ND_noise2d_vector2" file="../genglsl/mx_noise2d_vector2.glsl" function="mx_noise2d_vector2" target="genmsl" />
   <implementation name="IM_noise2d_vector3_genmsl" nodedef="ND_noise2d_vector3" file="../genglsl/mx_noise2d_vector3.glsl" function="mx_noise2d_vector3" target="genmsl" />
   <implementation name="IM_noise2d_vector4_genmsl" nodedef="ND_noise2d_vector4" file="../genglsl/mx_noise2d_vector4.glsl" function="mx_noise2d_vector4" target="genmsl" />
-  <implementation name="IM_noise2d_vector2FA_genmsl" nodedef="ND_noise2d_vector2FA" file="../genglsl/mx_noise2d_fa_vector2.glsl" function="mx_noise2d_fa_vector2" target="genmsl" />
-  <implementation name="IM_noise2d_vector3FA_genmsl" nodedef="ND_noise2d_vector3FA" file="../genglsl/mx_noise2d_fa_vector3.glsl" function="mx_noise2d_fa_vector3" target="genmsl" />
-  <implementation name="IM_noise2d_vector4FA_genmsl" nodedef="ND_noise2d_vector4FA" file="../genglsl/mx_noise2d_fa_vector4.glsl" function="mx_noise2d_fa_vector4" target="genmsl" />
 
   <!-- <noise3d> -->
   <implementation name="IM_noise3d_float_genmsl" nodedef="ND_noise3d_float" file="../genglsl/mx_noise3d_float.glsl" function="mx_noise3d_float" target="genmsl" />
-  <implementation name="IM_noise3d_color3_genmsl" nodedef="ND_noise3d_color3" file="../genglsl/mx_noise3d_vector3.glsl" function="mx_noise3d_vector3" target="genmsl" />
-  <implementation name="IM_noise3d_color4_genmsl" nodedef="ND_noise3d_color4" file="../genglsl/mx_noise3d_vector4.glsl" function="mx_noise3d_vector4" target="genmsl" />
-  <implementation name="IM_noise3d_color3FA_genmsl" nodedef="ND_noise3d_color3FA" file="../genglsl/mx_noise3d_fa_vector3.glsl" function="mx_noise3d_fa_vector3" target="genmsl" />
-  <implementation name="IM_noise3d_color4FA_genmsl" nodedef="ND_noise3d_color4FA" file="../genglsl/mx_noise3d_fa_vector4.glsl" function="mx_noise3d_fa_vector4" target="genmsl" />
   <implementation name="IM_noise3d_vector2_genmsl" nodedef="ND_noise3d_vector2" file="../genglsl/mx_noise3d_vector2.glsl" function="mx_noise3d_vector2" target="genmsl" />
   <implementation name="IM_noise3d_vector3_genmsl" nodedef="ND_noise3d_vector3" file="../genglsl/mx_noise3d_vector3.glsl" function="mx_noise3d_vector3" target="genmsl" />
   <implementation name="IM_noise3d_vector4_genmsl" nodedef="ND_noise3d_vector4" file="../genglsl/mx_noise3d_vector4.glsl" function="mx_noise3d_vector4" target="genmsl" />
-  <implementation name="IM_noise3d_vector2FA_genmsl" nodedef="ND_noise3d_vector2FA" file="../genglsl/mx_noise3d_fa_vector2.glsl" function="mx_noise3d_fa_vector2" target="genmsl" />
-  <implementation name="IM_noise3d_vector3FA_genmsl" nodedef="ND_noise3d_vector3FA" file="../genglsl/mx_noise3d_fa_vector3.glsl" function="mx_noise3d_fa_vector3" target="genmsl" />
-  <implementation name="IM_noise3d_vector4FA_genmsl" nodedef="ND_noise3d_vector4FA" file="../genglsl/mx_noise3d_fa_vector4.glsl" function="mx_noise3d_fa_vector4" target="genmsl" />
 
   <!-- <fractal3d> -->
   <implementation name="IM_fractal3d_float_genmsl" nodedef="ND_fractal3d_float" file="../genglsl/mx_fractal3d_float.glsl" function="mx_fractal3d_float" target="genmsl" />
-  <implementation name="IM_fractal3d_color3_genmsl" nodedef="ND_fractal3d_color3" file="../genglsl/mx_fractal3d_vector3.glsl" function="mx_fractal3d_vector3" target="genmsl" />
-  <implementation name="IM_fractal3d_color4_genmsl" nodedef="ND_fractal3d_color4" file="../genglsl/mx_fractal3d_vector4.glsl" function="mx_fractal3d_vector4" target="genmsl" />
-  <implementation name="IM_fractal3d_color3FA_genmsl" nodedef="ND_fractal3d_color3FA" file="../genglsl/mx_fractal3d_fa_vector3.glsl" function="mx_fractal3d_fa_vector3" target="genmsl" />
-  <implementation name="IM_fractal3d_color4FA_genmsl" nodedef="ND_fractal3d_color4FA" file="../genglsl/mx_fractal3d_fa_vector4.glsl" function="mx_fractal3d_fa_vector4" target="genmsl" />
   <implementation name="IM_fractal3d_vector2_genmsl" nodedef="ND_fractal3d_vector2" file="../genglsl/mx_fractal3d_vector2.glsl" function="mx_fractal3d_vector2" target="genmsl" />
   <implementation name="IM_fractal3d_vector3_genmsl" nodedef="ND_fractal3d_vector3" file="../genglsl/mx_fractal3d_vector3.glsl" function="mx_fractal3d_vector3" target="genmsl" />
   <implementation name="IM_fractal3d_vector4_genmsl" nodedef="ND_fractal3d_vector4" file="../genglsl/mx_fractal3d_vector4.glsl" function="mx_fractal3d_vector4" target="genmsl" />
-  <implementation name="IM_fractal3d_vector2FA_genmsl" nodedef="ND_fractal3d_vector2FA" file="../genglsl/mx_fractal3d_fa_vector2.glsl" function="mx_fractal3d_fa_vector2" target="genmsl" />
-  <implementation name="IM_fractal3d_vector3FA_genmsl" nodedef="ND_fractal3d_vector3FA" file="../genglsl/mx_fractal3d_fa_vector3.glsl" function="mx_fractal3d_fa_vector3" target="genmsl" />
-  <implementation name="IM_fractal3d_vector4FA_genmsl" nodedef="ND_fractal3d_vector4FA" file="../genglsl/mx_fractal3d_fa_vector4.glsl" function="mx_fractal3d_fa_vector4" target="genmsl" />
 
   <!-- <cellnoise2d> -->
   <implementation name="IM_cellnoise2d_float_genmsl" nodedef="ND_cellnoise2d_float" file="../genglsl/mx_cellnoise2d_float.glsl" function="mx_cellnoise2d_float" target="genmsl" />
@@ -750,9 +729,9 @@
   <implementation name="IM_combine4_vector4_genmsl" nodedef="ND_combine4_vector4" target="genmsl" />
 
   <!-- <creatematrix> -->
-  <implementation name="IM_creatematrix_vector3_matrix33_genmsl" nodedef="ND_creatematrix_vector3_matrix33" file="../genglsl/mx_creatematrix_vector3_matrix33.glsl" function="mx_creatematrix_vector3_matrix33" nodegroup="genmsl" />
-  <implementation name="IM_creatematrix_vector3_matrix44_genmsl" nodedef="ND_creatematrix_vector3_matrix44" file="../genglsl/mx_creatematrix_vector3_matrix44.glsl" function="mx_creatematrix_vector3_matrix44" nodegroup="genmsl" />
-  <implementation name="IM_creatematrix_vector4_matrix44_genmsl" nodedef="ND_creatematrix_vector4_matrix44" file="../genglsl/mx_creatematrix_vector4_matrix44.glsl" function="mx_creatematrix_vector4_matrix44" nodegroup="genmsl" />
+  <implementation name="IM_creatematrix_vector3_matrix33_genmsl" nodedef="ND_creatematrix_vector3_matrix33" file="../genglsl/mx_creatematrix_vector3_matrix33.glsl" function="mx_creatematrix_vector3_matrix33" target="genmsl" />
+  <implementation name="IM_creatematrix_vector3_matrix44_genmsl" nodedef="ND_creatematrix_vector3_matrix44" file="../genglsl/mx_creatematrix_vector3_matrix44.glsl" function="mx_creatematrix_vector3_matrix44" target="genmsl" />
+  <implementation name="IM_creatematrix_vector4_matrix44_genmsl" nodedef="ND_creatematrix_vector4_matrix44" file="../genglsl/mx_creatematrix_vector4_matrix44.glsl" function="mx_creatematrix_vector4_matrix44" target="genmsl" />
 
   <!-- ======================================================================== -->
   <!-- Convolution nodes                                                        -->
diff --git a/libraries/stdlib/genosl/mx_creatematrix.osl b/libraries/stdlib/genosl/mx_creatematrix.osl
index 933dce00ba..3e567d3b5b 100644
--- a/libraries/stdlib/genosl/mx_creatematrix.osl
+++ b/libraries/stdlib/genosl/mx_creatematrix.osl
@@ -1,4 +1,4 @@
-void mx_creatematrix_vector3_matrix33(vector in1, vector in2, vector in3, out matrix result)
+void mx_creatematrix_vector3_matrix33(vector in1, vector in2, vector in3, output matrix result)
 {
     result = matrix(in1.x, in1.y, in1.z,  0.0,
                     in2.x, in2.y, in2.z,  0.0,
@@ -6,7 +6,7 @@ void mx_creatematrix_vector3_matrix33(vector in1, vector in2, vector in3, out ma
                     0.0,   0.0,   0.0,    1.0);
 }
 
-void mx_creatematrix_vector3_matrix44(vector3 in1, vector3 in2, vector3 in3, vector3 in4, out matrix result)
+void mx_creatematrix_vector3_matrix44(vector in1, vector in2, vector in3, vector in4, output matrix result)
 {
     result = matrix(in1.x, in1.y, in1.z,  0.0,
                     in2.x, in2.y, in2.z,  0.0,
@@ -14,7 +14,7 @@ void mx_creatematrix_vector3_matrix44(vector3 in1, vector3 in2, vector3 in3, vec
                     in4.x, in4.y, in4.z,  1.0);
 }
 
-void mx_creatematrix_vector4_matrix44(vector4 in1, vector4 in2, vector4 in3, vector4 in4, out matrix result)
+void mx_creatematrix_vector4_matrix44(vector4 in1, vector4 in2, vector4 in3, vector4 in4, output matrix result)
 {
     result = matrix(in1.x, in1.y, in1.z,  in1.w,
                     in2.x, in2.y, in2.z,  in2.w,
diff --git a/libraries/stdlib/genosl/mx_fractal3d_color3.osl b/libraries/stdlib/genosl/mx_fractal3d_color3.osl
deleted file mode 100644
index bf1744890b..0000000000
--- a/libraries/stdlib/genosl/mx_fractal3d_color3.osl
+++ /dev/null
@@ -1,5 +0,0 @@
-void mx_fractal3d_color3(vector amplitude, int octaves, float lacunarity, float diminish, vector position, output color result)
-{
-    color f = mx_fbm(position, octaves, lacunarity, diminish, "snoise");
-    result = f * amplitude;
-}
diff --git a/libraries/stdlib/genosl/mx_fractal3d_color4.osl b/libraries/stdlib/genosl/mx_fractal3d_color4.osl
deleted file mode 100644
index 9943a92dfd..0000000000
--- a/libraries/stdlib/genosl/mx_fractal3d_color4.osl
+++ /dev/null
@@ -1,5 +0,0 @@
-void mx_fractal3d_color4(vector4 amplitude, int octaves, float lacunarity, float diminish, vector position, output color4 result)
-{
-    color4 f = mx_fbm(position, octaves, lacunarity, diminish, "snoise");
-    result = f * color4(color(amplitude.x, amplitude.y, amplitude.z), amplitude.w);
-}
diff --git a/libraries/stdlib/genosl/mx_fractal3d_fa_color3.osl b/libraries/stdlib/genosl/mx_fractal3d_fa_color3.osl
deleted file mode 100644
index 889848c692..0000000000
--- a/libraries/stdlib/genosl/mx_fractal3d_fa_color3.osl
+++ /dev/null
@@ -1,5 +0,0 @@
-void mx_fractal3d_fa_color3(float amplitude, int octaves, float lacunarity, float diminish, vector position, output color result)
-{
-    color f = mx_fbm(position, octaves, lacunarity, diminish, "snoise");
-    result = f * amplitude;
-}
diff --git a/libraries/stdlib/genosl/mx_fractal3d_fa_color4.osl b/libraries/stdlib/genosl/mx_fractal3d_fa_color4.osl
deleted file mode 100644
index d2a8f49291..0000000000
--- a/libraries/stdlib/genosl/mx_fractal3d_fa_color4.osl
+++ /dev/null
@@ -1,5 +0,0 @@
-void mx_fractal3d_fa_color4(float amplitude, int octaves, float lacunarity, float diminish, vector position, output color4 result)
-{
-    color4 f = mx_fbm(position, octaves, lacunarity, diminish, "snoise");
-    result = f * amplitude;
-}
diff --git a/libraries/stdlib/genosl/mx_fractal3d_fa_vector2.osl b/libraries/stdlib/genosl/mx_fractal3d_fa_vector2.osl
deleted file mode 100644
index c1266d473c..0000000000
--- a/libraries/stdlib/genosl/mx_fractal3d_fa_vector2.osl
+++ /dev/null
@@ -1,5 +0,0 @@
-void mx_fractal3d_fa_vector2(float amplitude, int octaves, float lacunarity, float diminish, vector position, output vector2 result)
-{
-    vector2 f = mx_fbm(position, octaves, lacunarity, diminish, "snoise");
-    result = f * amplitude;
-}
diff --git a/libraries/stdlib/genosl/mx_fractal3d_fa_vector3.osl b/libraries/stdlib/genosl/mx_fractal3d_fa_vector3.osl
deleted file mode 100644
index 34f6515ca8..0000000000
--- a/libraries/stdlib/genosl/mx_fractal3d_fa_vector3.osl
+++ /dev/null
@@ -1,5 +0,0 @@
-void mx_fractal3d_fa_vector3(float amplitude, int octaves, float lacunarity, float diminish, vector position, output vector result)
-{
-    vector f = mx_fbm(position, octaves, lacunarity, diminish, "snoise");
-    result = f * amplitude;
-}
diff --git a/libraries/stdlib/genosl/mx_fractal3d_fa_vector4.osl b/libraries/stdlib/genosl/mx_fractal3d_fa_vector4.osl
deleted file mode 100644
index fb5a8c73d6..0000000000
--- a/libraries/stdlib/genosl/mx_fractal3d_fa_vector4.osl
+++ /dev/null
@@ -1,5 +0,0 @@
-void mx_fractal3d_fa_vector4(float amplitude, int octaves, float lacunarity, float diminish, vector position, output vector4 result)
-{
-    vector4 f = mx_fbm(position, octaves, lacunarity, diminish, "snoise");
-    result = f * amplitude;
-}
diff --git a/libraries/stdlib/genosl/mx_noise2d_color3.osl b/libraries/stdlib/genosl/mx_noise2d_color3.osl
deleted file mode 100644
index 37421ee810..0000000000
--- a/libraries/stdlib/genosl/mx_noise2d_color3.osl
+++ /dev/null
@@ -1,5 +0,0 @@
-void mx_noise2d_color3(vector amplitude, float pivot, vector2 texcoord, output color result)
-{
-    color value = noise("snoise", texcoord.x, texcoord.y);
-    result = value * amplitude + pivot;
-}
diff --git a/libraries/stdlib/genosl/mx_noise2d_color4.osl b/libraries/stdlib/genosl/mx_noise2d_color4.osl
deleted file mode 100644
index ec8064c577..0000000000
--- a/libraries/stdlib/genosl/mx_noise2d_color4.osl
+++ /dev/null
@@ -1,5 +0,0 @@
-void mx_noise2d_color4(vector4 amplitude, float pivot, vector2 texcoord, output color4 result)
-{
-    color4 value = mx_noise("snoise", texcoord.x, texcoord.y);
-    result = value * color4(color(amplitude.x, amplitude.y, amplitude.z), amplitude.w) + pivot;
-}
diff --git a/libraries/stdlib/genosl/mx_noise2d_fa_color3.osl b/libraries/stdlib/genosl/mx_noise2d_fa_color3.osl
deleted file mode 100644
index 29c09c1ae2..0000000000
--- a/libraries/stdlib/genosl/mx_noise2d_fa_color3.osl
+++ /dev/null
@@ -1,5 +0,0 @@
-void mx_noise2d_fa_color3(float amplitude, float pivot, vector2 texcoord, output color result)
-{
-    color value = noise("snoise", texcoord.x, texcoord.y);
-    result = value * amplitude + pivot;
-}
diff --git a/libraries/stdlib/genosl/mx_noise2d_fa_color4.osl b/libraries/stdlib/genosl/mx_noise2d_fa_color4.osl
deleted file mode 100644
index 35d3463ff7..0000000000
--- a/libraries/stdlib/genosl/mx_noise2d_fa_color4.osl
+++ /dev/null
@@ -1,5 +0,0 @@
-void mx_noise2d_fa_color4(float amplitude, float pivot, vector2 texcoord, output color4 result)
-{
-    color4 value = mx_noise("snoise", texcoord.x, texcoord.y);
-    result = value * amplitude + pivot;
-}
diff --git a/libraries/stdlib/genosl/mx_noise2d_fa_vector2.osl b/libraries/stdlib/genosl/mx_noise2d_fa_vector2.osl
deleted file mode 100644
index b64dc6de7a..0000000000
--- a/libraries/stdlib/genosl/mx_noise2d_fa_vector2.osl
+++ /dev/null
@@ -1,5 +0,0 @@
-void mx_noise2d_fa_vector2(float amplitude, float pivot, vector2 texcoord, output vector2 result)
-{
-    vector2 value = mx_noise("snoise", texcoord.x, texcoord.y);
-    result = value * amplitude + pivot;
-}
diff --git a/libraries/stdlib/genosl/mx_noise2d_fa_vector3.osl b/libraries/stdlib/genosl/mx_noise2d_fa_vector3.osl
deleted file mode 100644
index c1f060a265..0000000000
--- a/libraries/stdlib/genosl/mx_noise2d_fa_vector3.osl
+++ /dev/null
@@ -1,5 +0,0 @@
-void mx_noise2d_fa_vector3(float amplitude, float pivot, vector2 texcoord, output vector result)
-{
-    vector value = noise("snoise", texcoord.x, texcoord.y);
-    result = value * amplitude + pivot;
-}
diff --git a/libraries/stdlib/genosl/mx_noise2d_fa_vector4.osl b/libraries/stdlib/genosl/mx_noise2d_fa_vector4.osl
deleted file mode 100644
index 9cb9f57c7c..0000000000
--- a/libraries/stdlib/genosl/mx_noise2d_fa_vector4.osl
+++ /dev/null
@@ -1,5 +0,0 @@
-void mx_noise2d_fa_vector4(float amplitude, float pivot, vector2 texcoord, output vector4 result)
-{
-    vector4 value = mx_noise("snoise", texcoord.x, texcoord.y);
-    result = value * amplitude + pivot;
-}
diff --git a/libraries/stdlib/genosl/mx_noise3d_color3.osl b/libraries/stdlib/genosl/mx_noise3d_color3.osl
deleted file mode 100644
index f4649a598a..0000000000
--- a/libraries/stdlib/genosl/mx_noise3d_color3.osl
+++ /dev/null
@@ -1,5 +0,0 @@
-void mx_noise3d_color3(vector amplitude, float pivot, vector position, output color result)
-{
-    color value = noise("snoise", position);
-    result = value * amplitude + pivot;
-}
diff --git a/libraries/stdlib/genosl/mx_noise3d_color4.osl b/libraries/stdlib/genosl/mx_noise3d_color4.osl
deleted file mode 100644
index c522f81493..0000000000
--- a/libraries/stdlib/genosl/mx_noise3d_color4.osl
+++ /dev/null
@@ -1,5 +0,0 @@
-void mx_noise3d_color4(vector4 amplitude, float pivot, vector position, output color4 result)
-{
-    color4 value = mx_noise("snoise", position);
-    result = value * color4(color(amplitude.x, amplitude.y, amplitude.z), amplitude.w) + pivot;
-}
diff --git a/libraries/stdlib/genosl/mx_noise3d_fa_color3.osl b/libraries/stdlib/genosl/mx_noise3d_fa_color3.osl
deleted file mode 100644
index 83b777b2f2..0000000000
--- a/libraries/stdlib/genosl/mx_noise3d_fa_color3.osl
+++ /dev/null
@@ -1,5 +0,0 @@
-void mx_noise3d_fa_color3(float amplitude, float pivot, vector position, output color result)
-{
-    color value = noise("snoise", position);
-    result = value * amplitude + pivot;
-}
diff --git a/libraries/stdlib/genosl/mx_noise3d_fa_color4.osl b/libraries/stdlib/genosl/mx_noise3d_fa_color4.osl
deleted file mode 100644
index ee1a48ea0c..0000000000
--- a/libraries/stdlib/genosl/mx_noise3d_fa_color4.osl
+++ /dev/null
@@ -1,5 +0,0 @@
-void mx_noise3d_fa_color4(float amplitude, float pivot, vector position, output color4 result)
-{
-    color4 value = mx_noise("snoise", position);
-    result = value * amplitude + pivot;
-}
diff --git a/libraries/stdlib/genosl/mx_noise3d_fa_vector2.osl b/libraries/stdlib/genosl/mx_noise3d_fa_vector2.osl
deleted file mode 100644
index 9317d8933b..0000000000
--- a/libraries/stdlib/genosl/mx_noise3d_fa_vector2.osl
+++ /dev/null
@@ -1,5 +0,0 @@
-void mx_noise3d_fa_vector2(float amplitude, float pivot, vector position, output vector2 result)
-{
-    vector2 value = mx_noise("snoise", position);
-    result = value * amplitude + pivot;
-}
diff --git a/libraries/stdlib/genosl/mx_noise3d_fa_vector3.osl b/libraries/stdlib/genosl/mx_noise3d_fa_vector3.osl
deleted file mode 100644
index 4e235febce..0000000000
--- a/libraries/stdlib/genosl/mx_noise3d_fa_vector3.osl
+++ /dev/null
@@ -1,5 +0,0 @@
-void mx_noise3d_fa_vector3(float amplitude, float pivot, vector position, output vector result)
-{
-    vector value = noise("snoise", position);
-    result = value * amplitude + pivot;
-}
diff --git a/libraries/stdlib/genosl/mx_noise3d_fa_vector4.osl b/libraries/stdlib/genosl/mx_noise3d_fa_vector4.osl
deleted file mode 100644
index 177fc3f286..0000000000
--- a/libraries/stdlib/genosl/mx_noise3d_fa_vector4.osl
+++ /dev/null
@@ -1,5 +0,0 @@
-void mx_noise3d_fa_vector4(float amplitude, float pivot, vector position, output vector4 result)
-{
-    vector4 value = mx_noise("snoise", position);
-    result = value * amplitude + pivot;
-}
diff --git a/libraries/stdlib/genosl/mx_normalmap.osl b/libraries/stdlib/genosl/mx_normalmap.osl
index bf75781f51..79b31df69d 100644
--- a/libraries/stdlib/genosl/mx_normalmap.osl
+++ b/libraries/stdlib/genosl/mx_normalmap.osl
@@ -6,7 +6,7 @@ void mx_normalmap_vector2(vector value, string map_space, vector2 normal_scale,
         vector v = value * 2.0 - 1.0;
         vector T = normalize(U - dot(U, N) * N);
         vector B = normalize(cross(N, T));
-        result = normalize(T * v[0] * normal_scale[0] + B * v[1] * normal_scale[1] + N * v[2]);
+        result = normalize(T * v[0] * normal_scale.x + B * v[1] * normal_scale.y + N * v[2]);
     }
     // Object space
     else
diff --git a/libraries/stdlib/genosl/stdlib_genosl_impl.mtlx b/libraries/stdlib/genosl/stdlib_genosl_impl.mtlx
index ae3f6777cf..7268ee61dd 100644
--- a/libraries/stdlib/genosl/stdlib_genosl_impl.mtlx
+++ b/libraries/stdlib/genosl/stdlib_genosl_impl.mtlx
@@ -99,42 +99,21 @@
 
   <!-- <noise2d> -->
   <implementation name="IM_noise2d_float_genosl" nodedef="ND_noise2d_float" file="mx_noise2d_float.osl" function="mx_noise2d_float" target="genosl" />
-  <implementation name="IM_noise2d_color3_genosl" nodedef="ND_noise2d_color3" file="mx_noise2d_color3.osl" function="mx_noise2d_color3" target="genosl" />
-  <implementation name="IM_noise2d_color4_genosl" nodedef="ND_noise2d_color4" file="mx_noise2d_color4.osl" function="mx_noise2d_color4" target="genosl" />
-  <implementation name="IM_noise2d_color3FA_genosl" nodedef="ND_noise2d_color3FA" file="mx_noise2d_fa_color3.osl" function="mx_noise2d_fa_color3" target="genosl" />
-  <implementation name="IM_noise2d_color4FA_genosl" nodedef="ND_noise2d_color4FA" file="mx_noise2d_fa_color4.osl" function="mx_noise2d_fa_color4" target="genosl" />
   <implementation name="IM_noise2d_vector2_genosl" nodedef="ND_noise2d_vector2" file="mx_noise2d_vector2.osl" function="mx_noise2d_vector2" target="genosl" />
   <implementation name="IM_noise2d_vector3_genosl" nodedef="ND_noise2d_vector3" file="mx_noise2d_vector3.osl" function="mx_noise2d_vector3" target="genosl" />
   <implementation name="IM_noise2d_vector4_genosl" nodedef="ND_noise2d_vector4" file="mx_noise2d_vector4.osl" function="mx_noise2d_vector4" target="genosl" />
-  <implementation name="IM_noise2d_vector2FA_genosl" nodedef="ND_noise2d_vector2FA" file="mx_noise2d_fa_vector2.osl" function="mx_noise2d_fa_vector2" target="genosl" />
-  <implementation name="IM_noise2d_vector3FA_genosl" nodedef="ND_noise2d_vector3FA" file="mx_noise2d_fa_vector3.osl" function="mx_noise2d_fa_vector3" target="genosl" />
-  <implementation name="IM_noise2d_vector4FA_genosl" nodedef="ND_noise2d_vector4FA" file="mx_noise2d_fa_vector4.osl" function="mx_noise2d_fa_vector4" target="genosl" />
 
   <!-- <noise3d> -->
   <implementation name="IM_noise3d_float_genosl" nodedef="ND_noise3d_float" file="mx_noise3d_float.osl" function="mx_noise3d_float" target="genosl" />
-  <implementation name="IM_noise3d_color3_genosl" nodedef="ND_noise3d_color3" file="mx_noise3d_color3.osl" function="mx_noise3d_color3" target="genosl" />
-  <implementation name="IM_noise3d_color4_genosl" nodedef="ND_noise3d_color4" file="mx_noise3d_color4.osl" function="mx_noise3d_color4" target="genosl" />
-  <implementation name="IM_noise3d_color3FA_genosl" nodedef="ND_noise3d_color3FA" file="mx_noise3d_fa_color3.osl" function="mx_noise3d_fa_color3" target="genosl" />
-  <implementation name="IM_noise3d_color4FA_genosl" nodedef="ND_noise3d_color4FA" file="mx_noise3d_fa_color4.osl" function="mx_noise3d_fa_color4" target="genosl" />
   <implementation name="IM_noise3d_vector2_genosl" nodedef="ND_noise3d_vector2" file="mx_noise3d_vector2.osl" function="mx_noise3d_vector2" target="genosl" />
   <implementation name="IM_noise3d_vector3_genosl" nodedef="ND_noise3d_vector3" file="mx_noise3d_vector3.osl" function="mx_noise3d_vector3" target="genosl" />
   <implementation name="IM_noise3d_vector4_genosl" nodedef="ND_noise3d_vector4" file="mx_noise3d_vector4.osl" function="mx_noise3d_vector4" target="genosl" />
-  <implementation name="IM_noise3d_vector2FA_genosl" nodedef="ND_noise3d_vector2FA" file="mx_noise3d_fa_vector2.osl" function="mx_noise3d_fa_vector2" target="genosl" />
-  <implementation name="IM_noise3d_vector3FA_genosl" nodedef="ND_noise3d_vector3FA" file="mx_noise3d_fa_vector3.osl" function="mx_noise3d_fa_vector3" target="genosl" />
-  <implementation name="IM_noise3d_vector4FA_genosl" nodedef="ND_noise3d_vector4FA" file="mx_noise3d_fa_vector4.osl" function="mx_noise3d_fa_vector4" target="genosl" />
 
   <!-- <fractal3d> -->
   <implementation name="IM_fractal3d_float_genosl" nodedef="ND_fractal3d_float" file="mx_fractal3d_float.osl" function="mx_fractal3d_float" target="genosl" />
-  <implementation name="IM_fractal3d_color3_genosl" nodedef="ND_fractal3d_color3" file="mx_fractal3d_color3.osl" function="mx_fractal3d_color3" target="genosl" />
-  <implementation name="IM_fractal3d_color4_genosl" nodedef="ND_fractal3d_color4" file="mx_fractal3d_color4.osl" function="mx_fractal3d_color4" target="genosl" />
-  <implementation name="IM_fractal3d_color3FA_genosl" nodedef="ND_fractal3d_color3FA" file="mx_fractal3d_fa_color3.osl" function="mx_fractal3d_fa_color3" target="genosl" />
-  <implementation name="IM_fractal3d_color4FA_genosl" nodedef="ND_fractal3d_color4FA" file="mx_fractal3d_fa_color4.osl" function="mx_fractal3d_fa_color4" target="genosl" />
   <implementation name="IM_fractal3d_vector2_genosl" nodedef="ND_fractal3d_vector2" file="mx_fractal3d_vector2.osl" function="mx_fractal3d_vector2" target="genosl" />
   <implementation name="IM_fractal3d_vector3_genosl" nodedef="ND_fractal3d_vector3" file="mx_fractal3d_vector3.osl" function="mx_fractal3d_vector3" target="genosl" />
   <implementation name="IM_fractal3d_vector4_genosl" nodedef="ND_fractal3d_vector4" file="mx_fractal3d_vector4.osl" function="mx_fractal3d_vector4" target="genosl" />
-  <implementation name="IM_fractal3d_vector2FA_genosl" nodedef="ND_fractal3d_vector2FA" file="mx_fractal3d_fa_vector2.osl" function="mx_fractal3d_fa_vector2" target="genosl" />
-  <implementation name="IM_fractal3d_vector3FA_genosl" nodedef="ND_fractal3d_vector3FA" file="mx_fractal3d_fa_vector3.osl" function="mx_fractal3d_fa_vector3" target="genosl" />
-  <implementation name="IM_fractal3d_vector4FA_genosl" nodedef="ND_fractal3d_vector4FA" file="mx_fractal3d_fa_vector4.osl" function="mx_fractal3d_fa_vector4" target="genosl" />
 
   <!-- <cellnoise2d> -->
   <implementation name="IM_cellnoise2d_float_genosl" nodedef="ND_cellnoise2d_float" file="mx_cellnoise2d_float.osl" function="mx_cellnoise2d_float" target="genosl" />
@@ -753,9 +732,9 @@
   <implementation name="IM_combine4_vector4_genosl" nodedef="ND_combine4_vector4" target="genosl" />
 
   <!-- <creatematrix> -->
-  <implementation name="IM_creatematrix_vector3_matrix33_genosl" nodedef="ND_creatematrix_vector3_matrix33" file="mx_creatematrix.osl" function="mx_creatematrix_vector3_matrix33" nodegroup="genosl" />
-  <implementation name="IM_creatematrix_vector3_matrix44_genosl" nodedef="ND_creatematrix_vector3_matrix44" file="mx_creatematrix.osl" function="mx_creatematrix_vector3_matrix44" nodegroup="genosl" />
-  <implementation name="IM_creatematrix_vector4_matrix44_genosl" nodedef="ND_creatematrix_vector4_matrix44" file="mx_creatematrix.osl" function="mx_creatematrix_vector4_matrix44" nodegroup="genosl" />
+  <implementation name="IM_creatematrix_vector3_matrix33_genosl" nodedef="ND_creatematrix_vector3_matrix33" file="mx_creatematrix.osl" function="mx_creatematrix_vector3_matrix33" target="genosl" />
+  <implementation name="IM_creatematrix_vector3_matrix44_genosl" nodedef="ND_creatematrix_vector3_matrix44" file="mx_creatematrix.osl" function="mx_creatematrix_vector3_matrix44" target="genosl" />
+  <implementation name="IM_creatematrix_vector4_matrix44_genosl" nodedef="ND_creatematrix_vector4_matrix44" file="mx_creatematrix.osl" function="mx_creatematrix_vector4_matrix44" target="genosl" />
 
   <!-- ======================================================================== -->
   <!-- Convolution nodes                                                        -->
diff --git a/libraries/stdlib/stdlib_ng.mtlx b/libraries/stdlib/stdlib_ng.mtlx
index 4983aaa477..b34dc71e5d 100644
--- a/libraries/stdlib/stdlib_ng.mtlx
+++ b/libraries/stdlib/stdlib_ng.mtlx
@@ -1309,6 +1309,200 @@
     <output name="out" type="vector4" nodename="N_mix_vector4" />
   </nodegraph>
 
+  <!--
+    <noise2d>
+  -->
+  <nodegraph name="NG_noise2d_color3" nodedef="ND_noise2d_color3">
+    <noise2d name="N_noise2d" type="vector3">
+      <input name="amplitude" type="vector3" interfacename="amplitude" />
+      <input name="pivot" type="float" interfacename="pivot" />
+      <input name="texcoord" type="vector2" interfacename="texcoord" />
+    </noise2d>
+    <output name="out" type="color3" nodename="N_noise2d" channels="xyz" />
+  </nodegraph>
+  <nodegraph name="NG_noise2d_color4" nodedef="ND_noise2d_color4">
+    <noise2d name="N_noise2d" type="vector4">
+      <input name="amplitude" type="vector4" interfacename="amplitude" />
+      <input name="pivot" type="float" interfacename="pivot" />
+      <input name="texcoord" type="vector2" interfacename="texcoord" />
+    </noise2d>
+    <output name="out" type="color4" nodename="N_noise2d" channels="xyzw" />
+  </nodegraph>
+  <nodegraph name="NG_noise2d_color3FA" nodedef="ND_noise2d_color3FA">
+    <noise2d name="N_noise2d" type="color3">
+      <input name="amplitude" type="vector3" interfacename="amplitude" channels="xxx" />
+      <input name="pivot" type="float" interfacename="pivot" />
+      <input name="texcoord" type="vector2" interfacename="texcoord" />
+    </noise2d>
+    <output name="out" type="color3" nodename="N_noise2d" />
+  </nodegraph>
+  <nodegraph name="NG_noise2d_color4FA" nodedef="ND_noise2d_color4FA">
+    <noise2d name="N_noise2d" type="color4">
+      <input name="amplitude" type="vector4" interfacename="amplitude" channels="xxxx" />
+      <input name="pivot" type="float" interfacename="pivot" />
+      <input name="texcoord" type="vector2" interfacename="texcoord" />
+    </noise2d>
+    <output name="out" type="color4" nodename="N_noise2d" />
+  </nodegraph>
+  <nodegraph name="NG_noise2d_vector2FA" nodedef="ND_noise2d_vector2FA">
+    <noise2d name="N_noise2d" type="vector2">
+      <input name="amplitude" type="vector2" interfacename="amplitude" channels="xx" />
+      <input name="pivot" type="float" interfacename="pivot" />
+      <input name="texcoord" type="vector2" interfacename="texcoord" />
+    </noise2d>
+    <output name="out" type="vector2" nodename="N_noise2d" />
+  </nodegraph>
+  <nodegraph name="NG_noise2d_vector3FA" nodedef="ND_noise2d_vector3FA">
+    <noise2d name="N_noise2d" type="vector3">
+      <input name="amplitude" type="vector3" interfacename="amplitude" channels="xxx" />
+      <input name="pivot" type="float" interfacename="pivot" />
+      <input name="texcoord" type="vector2" interfacename="texcoord" />
+    </noise2d>
+    <output name="out" type="vector3" nodename="N_noise2d" />
+  </nodegraph>
+  <nodegraph name="NG_noise2d_vector4FA" nodedef="ND_noise2d_vector4FA">
+    <noise2d name="N_noise2d" type="vector4">
+      <input name="amplitude" type="vector4" interfacename="amplitude" channels="xxxx" />
+      <input name="pivot" type="float" interfacename="pivot" />
+      <input name="texcoord" type="vector2" interfacename="texcoord" />
+    </noise2d>
+    <output name="out" type="vector4" nodename="N_noise2d" />
+  </nodegraph>
+
+  <!--
+    <noise3d>
+  -->
+  <nodegraph name="NG_noise3d_color3" nodedef="ND_noise3d_color3">
+    <noise3d name="N_noise3d" type="vector3">
+      <input name="amplitude" type="vector3" interfacename="amplitude" />
+      <input name="pivot" type="float" interfacename="pivot" />
+      <input name="position" type="vector3" interfacename="position" />
+    </noise3d>
+    <output name="out" type="color3" nodename="N_noise3d" channels="xyz" />
+  </nodegraph>
+  <nodegraph name="NG_noise3d_color4" nodedef="ND_noise3d_color4">
+    <noise3d name="N_noise3d" type="vector4">
+      <input name="amplitude" type="vector4" interfacename="amplitude" />
+      <input name="pivot" type="float" interfacename="pivot" />
+      <input name="position" type="vector3" interfacename="position" />
+    </noise3d>
+    <output name="out" type="color4" nodename="N_noise3d" channels="xyzw" />
+  </nodegraph>
+  <nodegraph name="NG_noise3d_color3FA" nodedef="ND_noise3d_color3FA">
+    <noise3d name="N_noise3d" type="color3">
+      <input name="amplitude" type="vector3" interfacename="amplitude" channels="xxx" />
+      <input name="pivot" type="float" interfacename="pivot" />
+      <input name="position" type="vector3" interfacename="position" />
+    </noise3d>
+    <output name="out" type="color3" nodename="N_noise3d" />
+  </nodegraph>
+  <nodegraph name="NG_noise3d_color4FA" nodedef="ND_noise3d_color4FA">
+    <noise3d name="N_noise3d" type="color4">
+      <input name="amplitude" type="vector4" interfacename="amplitude" channels="xxxx" />
+      <input name="pivot" type="float" interfacename="pivot" />
+      <input name="position" type="vector3" interfacename="position" />
+    </noise3d>
+    <output name="out" type="color4" nodename="N_noise3d" />
+  </nodegraph>
+  <nodegraph name="NG_noise3d_vector2FA" nodedef="ND_noise3d_vector2FA">
+    <noise3d name="N_noise3d" type="vector2">
+      <input name="amplitude" type="vector2" interfacename="amplitude" channels="xx" />
+      <input name="pivot" type="float" interfacename="pivot" />
+      <input name="position" type="vector3" interfacename="position" />
+    </noise3d>
+    <output name="out" type="vector2" nodename="N_noise3d" />
+  </nodegraph>
+  <nodegraph name="NG_noise3d_vector3FA" nodedef="ND_noise3d_vector3FA">
+    <noise3d name="N_noise3d" type="vector3">
+      <input name="amplitude" type="vector3" interfacename="amplitude" channels="xxx" />
+      <input name="pivot" type="float" interfacename="pivot" />
+      <input name="position" type="vector3" interfacename="position" />
+    </noise3d>
+    <output name="out" type="vector3" nodename="N_noise3d" />
+  </nodegraph>
+  <nodegraph name="NG_noise3d_vector4FA" nodedef="ND_noise3d_vector4FA">
+    <noise3d name="N_noise3d" type="vector4">
+      <input name="amplitude" type="vector4" interfacename="amplitude" channels="xxxx" />
+      <input name="pivot" type="float" interfacename="pivot" />
+      <input name="position" type="vector3" interfacename="position" />
+    </noise3d>
+    <output name="out" type="vector4" nodename="N_noise3d" />
+  </nodegraph>
+
+  <!--
+    <fractal3d>
+  -->
+  <nodegraph name="NG_fractal3d_color3" nodedef="ND_fractal3d_color3">
+    <fractal3d name="N_fractal3d" type="vector3">
+      <input name="amplitude" type="vector3" interfacename="amplitude" />
+      <input name="octaves" type="integer" interfacename="octaves" />
+      <input name="lacunarity" type="float" interfacename="lacunarity" />
+      <input name="diminish" type="float" interfacename="diminish" />
+      <input name="position" type="vector3" interfacename="position" />
+    </fractal3d>
+    <output name="out" type="color3" nodename="N_fractal3d" channels="xyz" />
+  </nodegraph>
+  <nodegraph name="NG_fractal3d_color4" nodedef="ND_fractal3d_color4">
+    <fractal3d name="N_fractal3d" type="vector4">
+      <input name="amplitude" type="vector4" interfacename="amplitude" />
+      <input name="octaves" type="integer" interfacename="octaves" />
+      <input name="lacunarity" type="float" interfacename="lacunarity" />
+      <input name="diminish" type="float" interfacename="diminish" />
+      <input name="position" type="vector3" interfacename="position" />
+    </fractal3d>
+    <output name="out" type="color4" nodename="N_fractal3d" channels="xyzw" />
+  </nodegraph>
+  <nodegraph name="NG_fractal3d_color3FA" nodedef="ND_fractal3d_color3FA">
+    <fractal3d name="N_fractal3d" type="color3">
+      <input name="amplitude" type="vector3" interfacename="amplitude" channels="xxx" />
+      <input name="octaves" type="integer" interfacename="octaves" />
+      <input name="lacunarity" type="float" interfacename="lacunarity" />
+      <input name="diminish" type="float" interfacename="diminish" />
+      <input name="position" type="vector3" interfacename="position" />
+    </fractal3d>
+    <output name="out" type="color3" nodename="N_fractal3d" />
+  </nodegraph>
+  <nodegraph name="NG_fractal3d_color4FA" nodedef="ND_fractal3d_color4FA">
+    <fractal3d name="N_fractal3d" type="color4">
+      <input name="amplitude" type="vector4" interfacename="amplitude" channels="xxxx" />
+      <input name="octaves" type="integer" interfacename="octaves" />
+      <input name="lacunarity" type="float" interfacename="lacunarity" />
+      <input name="diminish" type="float" interfacename="diminish" />
+      <input name="position" type="vector3" interfacename="position" />
+    </fractal3d>
+    <output name="out" type="color4" nodename="N_fractal3d" />
+  </nodegraph>
+  <nodegraph name="NG_fractal3d_vector2FA" nodedef="ND_fractal3d_vector2FA">
+    <fractal3d name="N_fractal3d" type="vector2">
+      <input name="amplitude" type="vector2" interfacename="amplitude" channels="xx" />
+      <input name="octaves" type="integer" interfacename="octaves" />
+      <input name="lacunarity" type="float" interfacename="lacunarity" />
+      <input name="diminish" type="float" interfacename="diminish" />
+      <input name="position" type="vector3" interfacename="position" />
+    </fractal3d>
+    <output name="out" type="vector2" nodename="N_fractal3d" />
+  </nodegraph>
+  <nodegraph name="NG_fractal3d_vector3FA" nodedef="ND_fractal3d_vector3FA">
+    <fractal3d name="N_fractal3d" type="vector3">
+      <input name="amplitude" type="vector3" interfacename="amplitude" channels="xxx" />
+      <input name="octaves" type="integer" interfacename="octaves" />
+      <input name="lacunarity" type="float" interfacename="lacunarity" />
+      <input name="diminish" type="float" interfacename="diminish" />
+      <input name="position" type="vector3" interfacename="position" />
+    </fractal3d>
+    <output name="out" type="vector3" nodename="N_fractal3d" />
+  </nodegraph>
+  <nodegraph name="NG_fractal3d_vector4FA" nodedef="ND_fractal3d_vector4FA">
+    <fractal3d name="N_fractal3d" type="vector4">
+      <input name="amplitude" type="vector4" interfacename="amplitude" channels="xxxx" />
+      <input name="octaves" type="integer" interfacename="octaves" />
+      <input name="lacunarity" type="float" interfacename="lacunarity" />
+      <input name="diminish" type="float" interfacename="diminish" />
+      <input name="position" type="vector3" interfacename="position" />
+    </fractal3d>
+    <output name="out" type="vector4" nodename="N_fractal3d" />
+  </nodegraph>
+
   <!--
     <unifiednoise2d>
     Combined 2d noises for artists.
@@ -1669,7 +1863,7 @@
     </subtract>
     <dotproduct name="dist_square" type="float">
       <input name="in1" type="vector2" nodename="delta" />
-      <input name="in2" type="vector2" nodename="delta"/>
+      <input name="in2" type="vector2" nodename="delta" />
     </dotproduct>
     <multiply name="rad_square" type="float">
       <input name="in1" type="float" interfacename="radius" />
@@ -2361,7 +2555,7 @@
     </convert>
     <output name="out" type="color3" nodename="to_rgb" />
   </nodegraph>
-  
+
   <!-- ======================================================================== -->
   <!-- Geometric nodes                                                          -->
   <!-- ======================================================================== -->
@@ -2479,7 +2673,7 @@
     </magnitude>
     <output name="out" type="float" nodename="N_mtlxmagnitude" />
   </nodegraph>
-  
+
   <!--
     Node: <trianglewave>
     Generate a triangle wave from the given scalar input.
diff --git a/resources/Materials/TestSuite/stdlib/noise/noise.mtlx b/resources/Materials/TestSuite/stdlib/noise/noise.mtlx
index f5df8ef9ed..9a43223c60 100644
--- a/resources/Materials/TestSuite/stdlib/noise/noise.mtlx
+++ b/resources/Materials/TestSuite/stdlib/noise/noise.mtlx
@@ -22,53 +22,18 @@
     <input name="amplitude" type="vector2" value="4.0, 4.0" />
     <input name="texcoord" type="vector2" nodename="scaled_texcoord" />
   </noise2d>
-  <noise2d name="noise2d_vector2_fa" type="vector2">
-    <input name="amplitude" type="float" value="4.0" />
-    <input name="texcoord" type="vector2" nodename="scaled_texcoord" />
-  </noise2d>
   <noise2d name="noise2d_vector3" type="vector3">
     <input name="amplitude" type="vector3" value="4.0, 4.0, 4.0" />
     <input name="texcoord" type="vector2" nodename="scaled_texcoord" />
   </noise2d>
-  <noise2d name="noise2d_vector3_fa" type="vector3">
-    <input name="amplitude" type="float" value="4.0" />
-    <input name="texcoord" type="vector2" nodename="scaled_texcoord" />
-  </noise2d>
   <noise2d name="noise2d_vector4" type="vector4">
     <input name="amplitude" type="vector4" value="4.0, 4.0, 4.0, 4.0" />
     <input name="texcoord" type="vector2" nodename="scaled_texcoord" />
   </noise2d>
-  <noise2d name="noise2d_vector4_fa" type="vector4">
-    <input name="amplitude" type="float" value="4.0" />
-    <input name="texcoord" type="vector2" nodename="scaled_texcoord" />
-  </noise2d>
-  <noise2d name="noise2d_color3" type="color3">
-    <input name="amplitude" type="vector3" value="4.0, 4.0, 4.0" />
-    <input name="texcoord" type="vector2" nodename="scaled_texcoord" />
-  </noise2d>
-  <noise2d name="noise2d_color3_fa" type="color3">
-    <input name="amplitude" type="float" value="4.0" />
-    <input name="texcoord" type="vector2" nodename="scaled_texcoord" />
-  </noise2d>
-  <noise2d name="noise2d_color4" type="color4">
-    <input name="amplitude" type="vector4" value="4.0, 4.0, 4.0, 4.0" />
-    <input name="texcoord" type="vector2" nodename="scaled_texcoord" />
-  </noise2d>
-  <noise2d name="noise2d_color4_fa" type="color4">
-    <input name="amplitude" type="float" value="4.0" />
-    <input name="texcoord" type="vector2" nodename="scaled_texcoord" />
-  </noise2d>
   <output name="out_noise2d_float" type="float" nodename="noise2d_float" />
   <output name="out_noise2d_vector2" type="vector2" nodename="noise2d_vector2" />
-  <output name="out_noise2d_vector2_fa" type="vector2" nodename="noise2d_vector2_fa" />
   <output name="out_noise2d_vector3" type="vector3" nodename="noise2d_vector3" />
-  <output name="out_noise2d_vector3_fa" type="vector3" nodename="noise2d_vector3_fa" />
   <output name="out_noise2d_vector4" type="vector4" nodename="noise2d_vector4" />
-  <output name="out_noise2d_vector4_fa" type="vector4" nodename="noise2d_vector4_fa" />
-  <output name="out_noise2d_color3" type="color3" nodename="noise2d_color3" />
-  <output name="out_noise2d_color3_fa" type="color3" nodename="noise2d_color3_fa" />
-  <output name="out_noise2d_color4" type="color4" nodename="noise2d_color4" />
-  <output name="out_noise2d_color4_fa" type="color4" nodename="noise2d_color4_fa" />
 
   <!-- 3D Perlin noise -->
   <noise3d name="noise3d_float" type="float">
@@ -79,53 +44,18 @@
     <input name="amplitude" type="vector2" value="4.0, 4.0" />
     <input name="position" type="vector3" nodename="scaled_position" />
   </noise3d>
-  <noise3d name="noise3d_vector2_fa" type="vector2">
-    <input name="amplitude" type="float" value="4.0" />
-    <input name="position" type="vector3" nodename="scaled_position" />
-  </noise3d>
   <noise3d name="noise3d_vector3" type="vector3">
     <input name="amplitude" type="vector3" value="4.0, 4.0, 4.0" />
     <input name="position" type="vector3" nodename="scaled_position" />
   </noise3d>
-  <noise3d name="noise3d_vector3_fa" type="vector3">
-    <input name="amplitude" type="float" value="4.0" />
-    <input name="position" type="vector3" nodename="scaled_position" />
-  </noise3d>
   <noise3d name="noise3d_vector4" type="vector4">
     <input name="amplitude" type="vector4" value="4.0, 4.0, 4.0, 4.0" />
     <input name="position" type="vector3" nodename="scaled_position" />
   </noise3d>
-  <noise3d name="noise3d_vector4_fa" type="vector4">
-    <input name="amplitude" type="float" value="4.0" />
-    <input name="position" type="vector3" nodename="scaled_position" />
-  </noise3d>
-  <noise3d name="noise3d_color3" type="color3">
-    <input name="amplitude" type="vector3" value="4.0, 4.0, 4.0" />
-    <input name="position" type="vector3" nodename="scaled_position" />
-  </noise3d>
-  <noise3d name="noise3d_color3_fa" type="color3">
-    <input name="amplitude" type="float" value="4.0" />
-    <input name="position" type="vector3" nodename="scaled_position" />
-  </noise3d>
-  <noise3d name="noise3d_color4" type="color4">
-    <input name="amplitude" type="vector4" value="4.0, 4.0, 4.0, 4.0" />
-    <input name="position" type="vector3" nodename="scaled_position" />
-  </noise3d>
-  <noise3d name="noise3d_color4_fa" type="color4">
-    <input name="amplitude" type="float" value="4.0" />
-    <input name="position" type="vector3" nodename="scaled_position" />
-  </noise3d>
   <output name="out_noise3d_float" type="float" nodename="noise3d_float" />
   <output name="out_noise3d_vector2" type="vector2" nodename="noise3d_vector2" />
-  <output name="out_noise3d_vector2_fa" type="vector2" nodename="noise3d_vector2_fa" />
   <output name="out_noise3d_vector3" type="vector3" nodename="noise3d_vector3" />
-  <output name="out_noise3d_vector3_fa" type="vector3" nodename="noise3d_vector3_fa" />
   <output name="out_noise3d_vector4" type="vector4" nodename="noise3d_vector4" />
-  <output name="out_noise3d_vector4_fa" type="vector4" nodename="noise3d_vector4_fa" />
-  <output name="out_noise3d_color3" type="color3" nodename="noise3d_color3" />
-  <output name="out_noise3d_color3_fa" type="color3" nodename="noise3d_color3_fa" />
-  <output name="out_noise3d_color4" type="color4" nodename="noise3d_color4" />
-  <output name="out_noise3d_color4_fa" type="color4" nodename="noise3d_color4_fa" />
 
   <!-- 3D Fractal noise -->
   <fractal3d name="fractal3d_float" type="float">
@@ -136,53 +66,18 @@
     <input name="amplitude" type="vector2" value="4.0, 4.0" />
     <input name="position" type="vector3" nodename="scaled_position" />
   </fractal3d>
-  <fractal3d name="fractal3d_vector2_fa" type="vector2">
-    <input name="amplitude" type="float" value="4.0" />
-    <input name="position" type="vector3" nodename="scaled_position" />
-  </fractal3d>
   <fractal3d name="fractal3d_vector3" type="vector3">
     <input name="amplitude" type="vector3" value="4.0, 4.0, 4.0" />
     <input name="position" type="vector3" nodename="scaled_position" />
   </fractal3d>
-  <fractal3d name="fractal3d_vector3_fa" type="vector3">
-    <input name="amplitude" type="float" value="4.0" />
-    <input name="position" type="vector3" nodename="scaled_position" />
-  </fractal3d>
   <fractal3d name="fractal3d_vector4" type="vector4">
     <input name="amplitude" type="vector4" value="4.0, 4.0, 4.0, 4.0" />
     <input name="position" type="vector3" nodename="scaled_position" />
   </fractal3d>
-  <fractal3d name="fractal3d_vector4_fa" type="vector4">
-    <input name="amplitude" type="float" value="4.0" />
-    <input name="position" type="vector3" nodename="scaled_position" />
-  </fractal3d>
-  <fractal3d name="fractal3d_color3" type="color3">
-    <input name="amplitude" type="vector3" value="4.0, 4.0, 4.0" />
-    <input name="position" type="vector3" nodename="scaled_position" />
-  </fractal3d>
-  <fractal3d name="fractal3d_color3_fa" type="color3">
-    <input name="amplitude" type="float" value="4.0" />
-    <input name="position" type="vector3" nodename="scaled_position" />
-  </fractal3d>
-  <fractal3d name="fractal3d_color4" type="color4">
-    <input name="amplitude" type="vector4" value="4.0, 4.0, 4.0, 4.0" />
-    <input name="position" type="vector3" nodename="scaled_position" />
-  </fractal3d>
-  <fractal3d name="fractal3d_color4_fa" type="color4">
-    <input name="amplitude" type="float" value="4.0" />
-    <input name="position" type="vector3" nodename="scaled_position" />
-  </fractal3d>
   <output name="out_fractal3d_float" type="float" nodename="fractal3d_float" />
   <output name="out_fractal3d_vector2" type="vector2" nodename="fractal3d_vector2" />
-  <output name="out_fractal3d_vector2_fa" type="vector2" nodename="fractal3d_vector2_fa" />
   <output name="out_fractal3d_vector3" type="vector3" nodename="fractal3d_vector3" />
-  <output name="out_fractal3d_vector3_fa" type="vector3" nodename="fractal3d_vector3_fa" />
   <output name="out_fractal3d_vector4" type="vector4" nodename="fractal3d_vector4" />
-  <output name="out_fractal3d_vector4_fa" type="vector4" nodename="fractal3d_vector4_fa" />
-  <output name="out_fractal3d_color3" type="color3" nodename="fractal3d_color3" />
-  <output name="out_fractal3d_color3_fa" type="color3" nodename="fractal3d_color3_fa" />
-  <output name="out_fractal3d_color4" type="color4" nodename="fractal3d_color4" />
-  <output name="out_fractal3d_color4_fa" type="color4" nodename="fractal3d_color4_fa" />
 
   <!-- 2D Cell noise -->
   <cellnoise2d name="cellnoise2d_float" type="float">
diff --git a/resources/Materials/TestSuite/stdlib/procedural/tiledshape.mtlx b/resources/Materials/TestSuite/stdlib/procedural/tiledshape.mtlx
index 69fd225f2c..fe6e414535 100644
--- a/resources/Materials/TestSuite/stdlib/procedural/tiledshape.mtlx
+++ b/resources/Materials/TestSuite/stdlib/procedural/tiledshape.mtlx
@@ -24,7 +24,7 @@
     <input name="surfaceshader" type="surfaceshader" nodename="SR_test_tiledcloverleafs" />
   </surfacematerial>
 
- <tiledhexagons name="tiledhexagons_color3" type="color3">
+  <tiledhexagons name="tiledhexagons_color3" type="color3">
     <input name="uvtiling" type="vector2" value="29, 29" />
     <input name="size" type="float" value="0.7" />
   </tiledhexagons>
diff --git a/resources/Materials/TestSuite/stdlib/upgrade/syntax_1_37.mtlx b/resources/Materials/TestSuite/stdlib/upgrade/syntax_1_37.mtlx
index 66dc69f668..7404b75575 100644
--- a/resources/Materials/TestSuite/stdlib/upgrade/syntax_1_37.mtlx
+++ b/resources/Materials/TestSuite/stdlib/upgrade/syntax_1_37.mtlx
@@ -58,7 +58,7 @@
     </multiply>
     <generalized_schlick_brdf name="dielectric_bsdf" type="BSDF">
       <input name="weight" type="float" value="1" />
-      <input name="color0" type="color3" nodename="F0" channels="rrr"/>
+      <input name="color0" type="color3" nodename="F0" channels="rrr" />
       <input name="color90" type="color3" value="1, 1, 1" />
       <input name="roughness" type="vector2" nodename="specular_roughness" />
       <input name="base" type="BSDF" nodename="transmission_mix" />