diff --git a/contrib/adsk/libraries/adsklib/adsklib_legacy_defs.mtlx b/contrib/adsk/libraries/adsklib/adsklib_legacy_defs.mtlx
new file mode 100644
index 0000000000..68fa84ff70
--- /dev/null
+++ b/contrib/adsk/libraries/adsklib/adsklib_legacy_defs.mtlx
@@ -0,0 +1,333 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/contrib/adsk/libraries/adsklib/adsklib_legacy_ng.mtlx b/contrib/adsk/libraries/adsklib/adsklib_legacy_ng.mtlx
new file mode 100644
index 0000000000..9cc2d53ab6
--- /dev/null
+++ b/contrib/adsk/libraries/adsklib/adsklib_legacy_ng.mtlx
@@ -0,0 +1,2219 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/contrib/adsk/libraries/adsklib/genglsl/adsklib_genglsl_impl.mtlx b/contrib/adsk/libraries/adsklib/genglsl/adsklib_genglsl_impl.mtlx
index 9d8e2e2661..55b209a7d9 100644
--- a/contrib/adsk/libraries/adsklib/genglsl/adsklib_genglsl_impl.mtlx
+++ b/contrib/adsk/libraries/adsklib/genglsl/adsklib_genglsl_impl.mtlx
@@ -7,4 +7,8 @@
-->
+
+
+
+
diff --git a/contrib/adsk/libraries/adsklib/genglsl/mx_turbulence2d_float.glsl b/contrib/adsk/libraries/adsklib/genglsl/mx_turbulence2d_float.glsl
new file mode 100644
index 0000000000..450ce03e5c
--- /dev/null
+++ b/contrib/adsk/libraries/adsklib/genglsl/mx_turbulence2d_float.glsl
@@ -0,0 +1,23 @@
+#include "../../stdlib/genglsl/lib/mx_noise.glsl"
+
+void mx_turbulence2d_float(float amplitude, float octaves, vec2 texcoord, out float result)
+{
+ float sum = 0.0;
+ float scale = 1.0;
+
+ // Accumulate the required number of octaves of noise.
+ float i = 0.0;
+ for (i = octaves; i >= 1.0; i -= 1.0) {
+ float value = mx_perlin_noise_float(texcoord * scale) / scale;
+ sum += abs(value);
+ scale *= 2.0;
+ }
+
+ // Add a portion of the remaining octave, if any.
+ if (i > 0.0) {
+ float value = mx_perlin_noise_float(texcoord * scale) / scale;
+ sum += abs(value) * i;
+ }
+
+ result = sum * amplitude;
+}
diff --git a/contrib/adsk/libraries/adsklib/genglsl/mx_turbulence3d_float.glsl b/contrib/adsk/libraries/adsklib/genglsl/mx_turbulence3d_float.glsl
new file mode 100644
index 0000000000..7ebce11c38
--- /dev/null
+++ b/contrib/adsk/libraries/adsklib/genglsl/mx_turbulence3d_float.glsl
@@ -0,0 +1,23 @@
+#include "../../stdlib/genglsl/lib/mx_noise.glsl"
+
+void mx_turbulence3d_float(float amplitude, float octaves, vec3 position, out float result)
+{
+ float sum = 0.0;
+ float scale = 1.0;
+
+ // Accumulate the required number of octaves of noise.
+ float i = 0.0;
+ for (i = octaves; i >= 1.0; i -= 1.0) {
+ float value = mx_perlin_noise_float(position * scale) / scale;
+ sum += abs(value);
+ scale *= 2.0;
+ }
+
+ // Add a portion of the remaining octave, if any.
+ if (i > 0.0) {
+ float value = mx_perlin_noise_float(position * scale) / scale;
+ sum += abs(value) * i;
+ }
+
+ result = sum * amplitude;
+}
diff --git a/contrib/adsk/libraries/adsklib/genmdl/adsklib_genmdl_impl.mtlx b/contrib/adsk/libraries/adsklib/genmdl/adsklib_genmdl_impl.mtlx
index b5210d71e5..f6ef06138b 100644
--- a/contrib/adsk/libraries/adsklib/genmdl/adsklib_genmdl_impl.mtlx
+++ b/contrib/adsk/libraries/adsklib/genmdl/adsklib_genmdl_impl.mtlx
@@ -8,4 +8,8 @@
+
+
+
+
diff --git a/contrib/adsk/libraries/adsklib/genosl/adsklib_genosl_impl.mtlx b/contrib/adsk/libraries/adsklib/genosl/adsklib_genosl_impl.mtlx
index 4f9f6558c6..821e3b8180 100644
--- a/contrib/adsk/libraries/adsklib/genosl/adsklib_genosl_impl.mtlx
+++ b/contrib/adsk/libraries/adsklib/genosl/adsklib_genosl_impl.mtlx
@@ -8,4 +8,8 @@
-->
+
+
+
+
diff --git a/contrib/adsk/libraries/adsklib/genosl/mx_turbulence2d_float.osl b/contrib/adsk/libraries/adsklib/genosl/mx_turbulence2d_float.osl
new file mode 100644
index 0000000000..45c9f4371a
--- /dev/null
+++ b/contrib/adsk/libraries/adsklib/genosl/mx_turbulence2d_float.osl
@@ -0,0 +1,4 @@
+void mx_turbulence2d_float(float amplitude, float octaves, vector2 texcoord, output float result)
+{
+ result = 0.5;
+}
diff --git a/contrib/adsk/libraries/adsklib/genosl/mx_turbulence3d_float.osl b/contrib/adsk/libraries/adsklib/genosl/mx_turbulence3d_float.osl
new file mode 100644
index 0000000000..1b7e3dcb33
--- /dev/null
+++ b/contrib/adsk/libraries/adsklib/genosl/mx_turbulence3d_float.osl
@@ -0,0 +1,4 @@
+void mx_turbulence3d_float(float amplitude, float octaves, vector position, output float result)
+{
+ result = 0.5;
+}
diff --git a/contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/ShaderBall_USD_MaterialX_sampler_Legacy.usda b/contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/ShaderBall_USD_MaterialX_sampler_Legacy.usda
new file mode 100644
index 0000000000..307f9c401d
--- /dev/null
+++ b/contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/ShaderBall_USD_MaterialX_sampler_Legacy.usda
@@ -0,0 +1,131 @@
+#usda 1.0
+(
+ defaultPrim = "ShaderBall"
+ metersPerUnit = 0.01
+ upAxis = "Y"
+)
+
+over "ShaderBall" (
+ references = @one_ball.usda@
+ variants = {
+ string shadingVariant = "Mirror"
+ }
+ prepend variantSets = "shadingVariant"
+)
+{
+ over "one_ball_MeshShape" (
+ prepend apiSchemas = ["MaterialBindingAPI"]
+ )
+ {
+ }
+
+ variantSet "shadingVariant" = {
+ "Generic" {
+ over "one_ball_MeshShape"
+ {
+ rel material:binding =
+
+ }
+ }
+ "Mirror" {
+ over "one_ball_MeshShape"
+ {
+ rel material:binding =
+
+ }
+ }
+ "Hardwood" {
+ over "one_ball_MeshShape"
+ {
+ rel material:binding =
+
+ }
+ }
+ "Metal" {
+ over "one_ball_MeshShape"
+ {
+ rel material:binding =
+
+ }
+ }
+ "Ceramic" {
+ over "one_ball_MeshShape"
+ {
+ rel material:binding =
+
+ }
+ }
+ "Concrete" {
+ over "one_ball_MeshShape"
+ {
+ rel material:binding =
+
+ }
+ }
+ "Glazing" {
+ over "one_ball_MeshShape"
+ {
+ rel material:binding =
+
+ }
+ }
+ "Masonry" {
+ over "one_ball_MeshShape"
+ {
+ rel material:binding =
+
+ }
+ }
+ "MetallicPaint" {
+ over "one_ball_MeshShape"
+ {
+ rel material:binding =
+
+ }
+ }
+ "Glass" {
+ over "one_ball_MeshShape"
+ {
+ rel material:binding =
+
+ }
+ }
+ "Stone" {
+ over "one_ball_MeshShape"
+ {
+ rel material:binding =
+
+ }
+ }
+ "WallPaint" {
+ over "one_ball_MeshShape"
+ {
+ rel material:binding =
+
+ }
+ }
+ "Water" {
+ over "one_ball_MeshShape"
+ {
+ rel material:binding =
+
+ }
+ }
+ "Plastic" {
+ over "one_ball_MeshShape"
+ {
+ rel material:binding =
+
+ }
+ }
+ }
+}
+
+over "MaterialX"
+(
+ references = [
+ @legacy_materials_test.mtlx@,
+ ]
+)
+{
+}
diff --git a/contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/legacy_materials_test.mtlx b/contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/legacy_materials_test.mtlx
new file mode 100644
index 0000000000..306fad115a
--- /dev/null
+++ b/contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/legacy_materials_test.mtlx
@@ -0,0 +1,413 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+