From e610f4ef767c42c421cdbfce57ea9ca015347dc7 Mon Sep 17 00:00:00 2001
From: Jonathan Stone <jstone@lucasfilm.com>
Date: Sat, 31 Dec 2022 13:25:42 -0800
Subject: [PATCH] Simplify OSL support library

- Add 'mx' prefixes to OSL helper functions.
- Remove outdated OSL helper functions.
- Minor improvements to code style.
---
 libraries/stdlib/genosl/include/mx_funcs.h    | 626 +++---------------
 .../stdlib/genosl/mx_fractal3d_color3.osl     |   2 +-
 .../stdlib/genosl/mx_fractal3d_color4.osl     |   4 +-
 .../stdlib/genosl/mx_fractal3d_fa_color3.osl  |   2 +-
 .../stdlib/genosl/mx_fractal3d_fa_color4.osl  |   2 +-
 .../stdlib/genosl/mx_fractal3d_fa_vector2.osl |   2 +-
 .../stdlib/genosl/mx_fractal3d_fa_vector3.osl |   2 +-
 .../stdlib/genosl/mx_fractal3d_fa_vector4.osl |   2 +-
 .../stdlib/genosl/mx_fractal3d_float.osl      |   2 +-
 .../stdlib/genosl/mx_fractal3d_vector2.osl    |   2 +-
 .../stdlib/genosl/mx_fractal3d_vector3.osl    |   2 +-
 .../stdlib/genosl/mx_fractal3d_vector4.osl    |   2 +-
 libraries/stdlib/genosl/mx_noise2d_color4.osl |   2 +-
 .../stdlib/genosl/mx_noise2d_fa_color4.osl    |   2 +-
 .../stdlib/genosl/mx_noise2d_fa_vector2.osl   |   2 +-
 .../stdlib/genosl/mx_noise2d_fa_vector4.osl   |   2 +-
 .../stdlib/genosl/mx_noise2d_vector2.osl      |   2 +-
 .../stdlib/genosl/mx_noise2d_vector4.osl      |   2 +-
 libraries/stdlib/genosl/mx_noise3d_color4.osl |   4 +-
 .../stdlib/genosl/mx_noise3d_fa_color4.osl    |   2 +-
 .../stdlib/genosl/mx_noise3d_fa_vector2.osl   |   2 +-
 .../stdlib/genosl/mx_noise3d_fa_vector4.osl   |   2 +-
 .../stdlib/genosl/mx_noise3d_vector2.osl      |   2 +-
 .../stdlib/genosl/mx_noise3d_vector4.osl      |   2 +-
 libraries/stdlib/genosl/mx_remap.inline       |   2 +-
 25 files changed, 120 insertions(+), 558 deletions(-)

diff --git a/libraries/stdlib/genosl/include/mx_funcs.h b/libraries/stdlib/genosl/include/mx_funcs.h
index 7c15fb653c..531b13cd4d 100644
--- a/libraries/stdlib/genosl/include/mx_funcs.h
+++ b/libraries/stdlib/genosl/include/mx_funcs.h
@@ -51,7 +51,7 @@ closure color mx_add (closure color a, closure color b) { return a+b; }
 
 matrix33 mx_add(matrix33 a, matrix33 b)
 {
-    return matrix33 (matrix(
+    return matrix33(matrix(
         a.m[0][0]+b.m[0][0], a.m[0][1]+b.m[0][1], a.m[0][2]+b.m[0][2], 0.0,
         a.m[1][0]+b.m[1][0], a.m[1][1]+b.m[1][1], a.m[1][2]+b.m[1][2], 0.0,
         a.m[2][0]+b.m[2][0], a.m[2][1]+b.m[2][1], a.m[2][2]+b.m[2][2], 0.0,
@@ -60,26 +60,29 @@ matrix33 mx_add(matrix33 a, matrix33 b)
 
 matrix33 mx_add(matrix33 a, float b)
 {
-    return matrix33 (matrix(a.m[0][0]+b, a.m[0][1]+b, a.m[0][2]+b, 0.0,
-                            a.m[1][0]+b, a.m[1][1]+b, a.m[1][2]+b, 0.0,
-                            a.m[2][0]+b, a.m[2][1]+b, a.m[2][2]+b, 0.0,
-                            0.0, 0.0, 0.0, 1.0));
+    return matrix33(matrix(
+        a.m[0][0]+b, a.m[0][1]+b, a.m[0][2]+b, 0.0,
+        a.m[1][0]+b, a.m[1][1]+b, a.m[1][2]+b, 0.0,
+        a.m[2][0]+b, a.m[2][1]+b, a.m[2][2]+b, 0.0,
+        0.0, 0.0, 0.0, 1.0));
 }
 
 matrix mx_add(matrix a, matrix b)
 {
-    return matrix (a[0][0]+b[0][0], a[0][1]+b[0][1], a[0][2]+b[0][2], a[0][3]+b[0][3],
-                   a[1][0]+b[1][0], a[1][1]+b[1][1], a[1][2]+b[1][2], a[1][3]+b[1][3],
-                   a[2][0]+b[2][0], a[2][1]+b[2][1], a[2][2]+b[2][2], a[2][3]+b[2][3],
-                   a[3][0]+b[3][0], a[3][1]+b[3][1], a[3][2]+b[3][2], a[3][3]+b[3][3]);
+    return matrix(
+        a[0][0]+b[0][0], a[0][1]+b[0][1], a[0][2]+b[0][2], a[0][3]+b[0][3],
+        a[1][0]+b[1][0], a[1][1]+b[1][1], a[1][2]+b[1][2], a[1][3]+b[1][3],
+        a[2][0]+b[2][0], a[2][1]+b[2][1], a[2][2]+b[2][2], a[2][3]+b[2][3],
+        a[3][0]+b[3][0], a[3][1]+b[3][1], a[3][2]+b[3][2], a[3][3]+b[3][3]);
 }
 
 matrix mx_add(matrix a, float b)
 {
-    return matrix (a[0][0]+b, a[0][1]+b, a[0][2]+b, a[0][3]+b,
-                   a[1][0]+b, a[1][1]+b, a[1][2]+b, a[1][3]+b,
-                   a[2][0]+b, a[2][1]+b, a[2][2]+b, a[2][3]+b,
-                   a[3][0]+b, a[3][1]+b, a[3][2]+b, a[3][3]+b);
+    return matrix(
+        a[0][0]+b, a[0][1]+b, a[0][2]+b, a[0][3]+b,
+        a[1][0]+b, a[1][1]+b, a[1][2]+b, a[1][3]+b,
+        a[2][0]+b, a[2][1]+b, a[2][2]+b, a[2][3]+b,
+        a[3][0]+b, a[3][1]+b, a[3][2]+b, a[3][3]+b);
 }
 
 
@@ -98,46 +101,45 @@ color mx_sub (color a, float b) { return a-b; }
 color4 mx_sub (color4 a, color4 b) { return a-b; }
 color4 mx_sub (color4 a, float b) { return a-b; }
 
-matrix33 mx_sub (matrix33 a, matrix33 b)
+matrix33 mx_sub(matrix33 a, matrix33 b)
 {
-    return matrix33 (matrix(
+    return matrix33(matrix(
         a.m[0][0]-b.m[0][0], a.m[0][1]-b.m[0][1], a.m[0][2]-b.m[0][2], 0.0,
         a.m[1][0]-b.m[1][0], a.m[1][1]-b.m[1][1], a.m[1][2]-b.m[1][2], 0.0,
         a.m[2][0]-b.m[2][0], a.m[2][1]-b.m[2][1], a.m[2][2]-b.m[2][2], 0.0,
         0.0, 0.0, 0.0, 1.0));
 }
 
-matrix33 mx_sub (matrix33 a, float b)
+matrix33 mx_sub(matrix33 a, float b)
 {
-    return matrix33 (matrix(
+    return matrix33(matrix(
         a.m[0][0]-b, a.m[0][1]-b, a.m[0][2]-b, 0.0,
         a.m[1][0]-b, a.m[1][1]-b, a.m[1][2]-b, 0.0,
         a.m[2][0]-b, a.m[2][1]-b, a.m[2][2]-b, 0.0,
         0.0, 0.0, 0.0, 1.0));
 }
 
-matrix mx_sub (matrix a, matrix b)
+matrix mx_sub(matrix a, matrix b)
 {
-    return matrix(a[0][0]-b[0][0], a[0][1]-b[0][1], a[0][2]-b[0][2], a[0][3]-b[0][3],
-                  a[1][0]-b[1][0], a[1][1]-b[1][1], a[1][2]-b[1][2], a[1][3]-b[1][3],
-                  a[2][0]-b[2][0], a[2][1]-b[2][1], a[2][2]-b[2][2], a[2][3]-b[2][3],
-                  a[3][0]-b[3][0], a[3][1]-b[3][1], a[3][2]-b[3][2], a[3][3]-b[3][3]);
+   return matrix(
+       a[0][0]-b[0][0], a[0][1]-b[0][1], a[0][2]-b[0][2], a[0][3]-b[0][3],
+       a[1][0]-b[1][0], a[1][1]-b[1][1], a[1][2]-b[1][2], a[1][3]-b[1][3],
+       a[2][0]-b[2][0], a[2][1]-b[2][1], a[2][2]-b[2][2], a[2][3]-b[2][3],
+       a[3][0]-b[3][0], a[3][1]-b[3][1], a[3][2]-b[3][2], a[3][3]-b[3][3]);
 }
 
-matrix mx_sub (matrix a, float b)
+matrix mx_sub(matrix a, float b)
 {
-    return matrix (a[0][0]-b, a[0][1]-b, a[0][2]-b, a[0][3]-b,
-                   a[1][0]-b, a[1][1]-b, a[1][2]-b, a[1][3]-b,
-                   a[2][0]-b, a[2][1]-b, a[2][2]-b, a[2][3]-b,
-                   a[3][0]-b, a[3][1]-b, a[3][2]-b, a[3][3]-b);
+    return matrix(
+        a[0][0]-b, a[0][1]-b, a[0][2]-b, a[0][3]-b,
+        a[1][0]-b, a[1][1]-b, a[1][2]-b, a[1][3]-b,
+        a[2][0]-b, a[2][1]-b, a[2][2]-b, a[2][3]-b,
+        a[3][0]-b, a[3][1]-b, a[3][2]-b, a[3][3]-b);
 }
 
 
-
-// remap `in` from [inLow, inHigh] to [outLow, outHigh], optionally clamping
-// to the new range.
-//
-float remap(float in, float inLow, float inHigh, float outLow, float outHigh, int doClamp)
+// remap `in` from [inLow, inHigh] to [outLow, outHigh], optionally clamping to the new range.
+float mx_remap(float in, float inLow, float inHigh, float outLow, float outHigh, int doClamp)
 {
       float x = (in - inLow)/(inHigh-inLow);
       if (doClamp == 1) {
@@ -146,7 +148,7 @@ float remap(float in, float inLow, float inHigh, float outLow, float outHigh, in
       return outLow + (outHigh - outLow) * x;
 }
 
-color remap(color in, color inLow, color inHigh, color outLow, color outHigh, int doClamp)
+color mx_remap(color in, color inLow, color inHigh, color outLow, color outHigh, int doClamp)
 {
       color x = (in - inLow) / (inHigh - inLow);
       if (doClamp == 1) {
@@ -155,7 +157,7 @@ color remap(color in, color inLow, color inHigh, color outLow, color outHigh, in
       return outLow + (outHigh - outLow) * x;
 }
 
-color remap(color in, float inLow, float inHigh, float outLow, float outHigh, int doClamp)
+color mx_remap(color in, float inLow, float inHigh, float outLow, float outHigh, int doClamp)
 {
       color x = (in - inLow) / (inHigh - inLow);
       if (doClamp == 1) {
@@ -164,103 +166,49 @@ color remap(color in, float inLow, float inHigh, float outLow, float outHigh, in
       return outLow + (outHigh - outLow) * x;
 }
 
-color4 remap(color4 c, color4 inLow, color4 inHigh, color4 outLow, color4 outHigh, int doClamp)
+color4 mx_remap(color4 c, color4 inLow, color4 inHigh, color4 outLow, color4 outHigh, int doClamp)
 {
-      return color4(remap(c.rgb, inLow.rgb, inHigh.rgb, outLow.rgb, outHigh.rgb, doClamp),
-                    remap(c.a, inLow.a, inHigh.a, outLow.a, outHigh.a, doClamp));
+      return color4(mx_remap(c.rgb, inLow.rgb, inHigh.rgb, outLow.rgb, outHigh.rgb, doClamp),
+                    mx_remap(c.a, inLow.a, inHigh.a, outLow.a, outHigh.a, doClamp));
 }
 
-color4 remap(color4 c, float inLow, float inHigh, float outLow, float outHigh, int doClamp)
+color4 mx_remap(color4 c, float inLow, float inHigh, float outLow, float outHigh, int doClamp)
 {
     color4 c4_inLow = color4(color(inLow), inLow);
     color4 c4_inHigh = color4(color(inHigh), inHigh);
     color4 c4_outLow = color4(color(outLow), outLow);
     color4 c4_outHigh = color4(color(outHigh), outHigh);
-    return remap(c, c4_inLow, c4_inHigh, c4_outLow, c4_outHigh, doClamp);
-}
-
-vector2 remap(vector2 in, vector2 inLow, vector2 inHigh, vector2 outLow, vector2 outHigh, int doClamp)
-{
-    return vector2 (remap(in.x, inLow.x, inHigh.x, outLow.x, outHigh.x, doClamp),
-                    remap(in.y, inLow.y, inHigh.y, outLow.y, outHigh.y, doClamp));
-}
-
-vector2 remap(vector2 in, float inLow, float inHigh, float outLow, float outHigh, int doClamp)
-{
-    return vector2 (remap(in.x, inLow, inHigh, outLow, outHigh, doClamp),
-                    remap(in.y, inLow, inHigh, outLow, outHigh, doClamp));
-}
-
-vector4 remap(vector4 in, vector4 inLow, vector4 inHigh, vector4 outLow, vector4 outHigh, int doClamp)
-{
-    return vector4 (remap(in.x, inLow.x, inHigh.x, outLow.x, outHigh.x, doClamp),
-                    remap(in.y, inLow.y, inHigh.y, outLow.y, outHigh.y, doClamp),
-                    remap(in.z, inLow.z, inHigh.z, outLow.z, outHigh.z, doClamp),
-                    remap(in.w, inLow.w, inHigh.w, outLow.w, outHigh.w, doClamp));
-}
-
-vector4 remap(vector4 in, float inLow, float inHigh, float outLow, float outHigh, int doClamp)
-{
-    return vector4 (remap(in.x, inLow, inHigh, outLow, outHigh, doClamp),
-                    remap(in.y, inLow, inHigh, outLow, outHigh, doClamp),
-                    remap(in.z, inLow, inHigh, outLow, outHigh, doClamp),
-                    remap(in.w, inLow, inHigh, outLow, outHigh, doClamp));
+    return mx_remap(c, c4_inLow, c4_inHigh, c4_outLow, c4_outHigh, doClamp);
 }
 
-
-
-float fgamma(float in, float g)
+vector2 mx_remap(vector2 in, vector2 inLow, vector2 inHigh, vector2 outLow, vector2 outHigh, int doClamp)
 {
-    return sign(in) * pow(abs(in), g);
+    return vector2(mx_remap(in.x, inLow.x, inHigh.x, outLow.x, outHigh.x, doClamp),
+                   mx_remap(in.y, inLow.y, inHigh.y, outLow.y, outHigh.y, doClamp));
 }
 
-color fgamma(color in, color g)
+vector2 mx_remap(vector2 in, float inLow, float inHigh, float outLow, float outHigh, int doClamp)
 {
-    return sign(in) * pow(abs(in), g);
+    return vector2(mx_remap(in.x, inLow, inHigh, outLow, outHigh, doClamp),
+                   mx_remap(in.y, inLow, inHigh, outLow, outHigh, doClamp));
 }
 
-color fgamma(color in, float g)
+vector4 mx_remap(vector4 in, vector4 inLow, vector4 inHigh, vector4 outLow, vector4 outHigh, int doClamp)
 {
-    return sign(in) * pow(abs(in), g);
+    return vector4(mx_remap(in.x, inLow.x, inHigh.x, outLow.x, outHigh.x, doClamp),
+                   mx_remap(in.y, inLow.y, inHigh.y, outLow.y, outHigh.y, doClamp),
+                   mx_remap(in.z, inLow.z, inHigh.z, outLow.z, outHigh.z, doClamp),
+                   mx_remap(in.w, inLow.w, inHigh.w, outLow.w, outHigh.w, doClamp));
 }
 
-color4 fgamma(color4 a, color4 b)
+vector4 mx_remap(vector4 in, float inLow, float inHigh, float outLow, float outHigh, int doClamp)
 {
-    return color4(fgamma(a.rgb, b.rgb), fgamma(a.a, b.a));
+    return vector4(mx_remap(in.x, inLow, inHigh, outLow, outHigh, doClamp),
+                   mx_remap(in.y, inLow, inHigh, outLow, outHigh, doClamp),
+                   mx_remap(in.z, inLow, inHigh, outLow, outHigh, doClamp),
+                   mx_remap(in.w, inLow, inHigh, outLow, outHigh, doClamp));
 }
 
-color4 fgamma(color4 a, float b)
-{
-    return fgamma(a, color4(color(b), b));
-}
-
-vector2 fgamma(vector2 in, vector2 g)
-{
-    return vector2 (fgamma(in.x, g.x), fgamma(in.y, g.y));
-}
-
-vector2 fgamma(vector2 in, float g)
-{
-    return vector2 (fgamma(in.x, g), fgamma(in.y, g));
-}
-
-vector4 fgamma(vector4 in, vector4 g)
-{
-    return vector4 (fgamma(in.x, g.x),
-                    fgamma(in.y, g.y),
-                    fgamma(in.z, g.z),
-                    fgamma(in.w, g.w));
-}
-
-vector4 fgamma(vector4 in, float g)
-{
-    return vector4 (fgamma(in.x, g),
-                    fgamma(in.y, g),
-                    fgamma(in.z, g),
-                    fgamma(in.w, g));
-}
-
-
 
 //
 // mx_contrast scales the input around a central `pivot` value.
@@ -313,113 +261,66 @@ vector2 mx_contrast(vector2 in, float amount, float pivot)
 
 vector4 mx_contrast(vector4 in, vector4 amount, vector4 pivot)
 {
-    return vector4 (mx_contrast(in.x, amount.x, pivot.x),
-                    mx_contrast(in.y, amount.y, pivot.y),
-                    mx_contrast(in.z, amount.z, pivot.z),
-                    mx_contrast(in.w, amount.w, pivot.w));
+    return vector4(mx_contrast(in.x, amount.x, pivot.x),
+                   mx_contrast(in.y, amount.y, pivot.y),
+                   mx_contrast(in.z, amount.z, pivot.z),
+                   mx_contrast(in.w, amount.w, pivot.w));
 }
 
 vector4 mx_contrast(vector4 in, float amount, float pivot)
 {
-    return vector4 (mx_contrast(in.x, amount, pivot),
-                    mx_contrast(in.y, amount, pivot),
-                    mx_contrast(in.z, amount, pivot),
-                    mx_contrast(in.w, amount, pivot));
+    return vector4(mx_contrast(in.x, amount, pivot),
+                   mx_contrast(in.y, amount, pivot),
+                   mx_contrast(in.z, amount, pivot),
+                   mx_contrast(in.w, amount, pivot));
 }
 
 
-
-vector2 noise (string noisetype, float x, float y)
+vector2 mx_noise(string noisetype, float x, float y)
 {
-    color cnoise = (color) noise (noisetype, x, y);
+    color cnoise = (color) noise(noisetype, x, y);
     return vector2 (cnoise[0], cnoise[1]);
 }
 
-color4 noise (string noisetype, float x, float y)
+color4 mx_noise(string noisetype, float x, float y)
 {
-    color cnoise = (color) noise (noisetype, x, y);
-    float fnoise = (float) noise (noisetype, x + 19, y + 73);
+    color cnoise = (color) noise(noisetype, x, y);
+    float fnoise = (float) noise(noisetype, x + 19, y + 73);
     return color4 (cnoise, fnoise);
 }
 
-vector4 noise (string noisetype, float x, float y)
+vector4 mx_noise(string noisetype, float x, float y)
 {
-    color cnoise = (color) noise (noisetype, x, y);
-    float fnoise = (float) noise (noisetype, x + 19, y + 73);
+    color cnoise = (color) noise(noisetype, x, y);
+    float fnoise = (float) noise(noisetype, x + 19, y + 73);
     return vector4 (cnoise[0], cnoise[1], cnoise[2], fnoise);
 }
 
-
-vector2 noise (string noisetype, point position)
+vector2 mx_noise(string noisetype, point position)
 {
-    color cnoise = (color) noise (noisetype, position);
+    color cnoise = (color) noise(noisetype, position);
     return vector2 (cnoise[0], cnoise[1]);
 }
 
-color4 noise (string noisetype, point position)
+color4 mx_noise(string noisetype, point position)
 {
-    color cnoise = (color) noise (noisetype, position);
-    float fnoise = (float) noise (noisetype, position+vector(19,73,29));
+    color cnoise = (color) noise(noisetype, position);
+    float fnoise = (float) noise(noisetype, position+vector(19,73,29));
     return color4 (cnoise, fnoise);
 }
 
-vector4 noise (string noisetype, point position)
+vector4 mx_noise(string noisetype, point position)
 {
-    color cnoise = (color) noise (noisetype, position);
-    float fnoise = (float) noise (noisetype, position+vector(19,73,29));
+    color cnoise = (color) noise(noisetype, position);
+    float fnoise = (float) noise(noisetype, position+vector(19,73,29));
     return vector4 (cnoise[0], cnoise[1], cnoise[2], fnoise);
 }
 
 
-
-vector2 cellnoise (float x, float y)
-{
-    color cnoise = (color) cellnoise (x, y);
-    return vector2 (cnoise[0], cnoise[1]);
-}
-
-color4 cellnoise (float x, float y)
-{
-    color cnoise = (color) cellnoise (x, y);
-    float fnoise = (float) cellnoise (x + 19, y + 73);
-    return color4 (cnoise, fnoise);
-}
-
-vector4 cellnoise (float x, float y)
-{
-    color cnoise = (color) cellnoise (x, y);
-    float fnoise = (float) cellnoise (x + 19, y + 73);
-    return vector4 (cnoise[0], cnoise[1], cnoise[2], fnoise);
-}
-
-
-
-vector2 cellnoise (point position)
-{
-    color cnoise = (color) cellnoise (position);
-    return vector2 (cnoise[0], cnoise[1]);
-}
-
-color4 cellnoise (point position)
-{
-    color cnoise = (color) cellnoise (position);
-    float fnoise = (float) cellnoise (position+vector(19,73,29));
-    return color4 (cnoise, fnoise);
-}
-
-vector4 cellnoise (point position)
-{
-    color cnoise = (color) cellnoise (position);
-    float fnoise = (float) cellnoise (position+vector(19,73,29));
-    return vector4 (cnoise[0], cnoise[1], cnoise[2], fnoise);
-}
-
-
-
 //
 // fractional Brownian motion
 //
-float fBm( point position, int octaves, float lacunarity, float diminish, string noisetype)
+float mx_fbm(point position, int octaves, float lacunarity, float diminish, string noisetype)
 {
     float out = 0;
     float amp = 1.0;
@@ -433,7 +334,7 @@ float fBm( point position, int octaves, float lacunarity, float diminish, string
     return out;
 }
 
-color fBm( point position, int octaves, float lacunarity, float diminish, string noisetype)
+color mx_fbm(point position, int octaves, float lacunarity, float diminish, string noisetype)
 {
     color out = 0;
     float amp = 1.0;
@@ -447,23 +348,23 @@ color fBm( point position, int octaves, float lacunarity, float diminish, string
     return out;
 }
 
-vector2 fBm( point position, int octaves, float lacunarity, float diminish, string noisetype)
+vector2 mx_fbm(point position, int octaves, float lacunarity, float diminish, string noisetype)
 {
-    return vector2 ((float) fBm (position, octaves, lacunarity, diminish, noisetype),
-                    (float) fBm (position+point(19, 193, 17), octaves, lacunarity, diminish, noisetype));
+    return vector2((float) mx_fbm(position, octaves, lacunarity, diminish, noisetype),
+                   (float) mx_fbm(position+point(19, 193, 17), octaves, lacunarity, diminish, noisetype));
 }
 
-color4 fBm( point position, int octaves, float lacunarity, float diminish, string noisetype)
+color4 mx_fbm(point position, int octaves, float lacunarity, float diminish, string noisetype)
 {
-    color c = (color) fBm (position, octaves, lacunarity, diminish, noisetype);
-    float f = (float) fBm (position+point(19, 193, 17), octaves, lacunarity, diminish, noisetype);
+    color c = (color) mx_fbm(position, octaves, lacunarity, diminish, noisetype);
+    float f = (float) mx_fbm(position+point(19, 193, 17), octaves, lacunarity, diminish, noisetype);
     return color4 (c, f);
 }
 
-vector4 fBm( point position, int octaves, float lacunarity, float diminish, string noisetype)
+vector4 mx_fbm(point position, int octaves, float lacunarity, float diminish, string noisetype)
 {
-    color c = (color) fBm (position, octaves, lacunarity, diminish, noisetype);
-    float f = (float) fBm (position+point(19, 193, 17), octaves, lacunarity, diminish, noisetype);
+    color c = (color) mx_fbm(position, octaves, lacunarity, diminish, noisetype);
+    float f = (float) mx_fbm(position+point(19, 193, 17), octaves, lacunarity, diminish, noisetype);
     return vector4 (c[0], c[1], c[2], f);
 }
 
@@ -675,346 +576,7 @@ vector mx_worley_noise_vector3(vector p, float jitter, int metric)
 }
 
 
-float swizzle_float (float in[4], string channels)
-{
-    float out;
-    float outF[4];
-    int c_len = strlen(channels);
-
-    for (int i=0; i<c_len; i++) {
-        string ch = substr(channels, i, 1);
-        if (ch == "r" || ch == "x")
-            outF[i] = in[0];
-        else if (ch == "g" || ch == "y")
-            outF[i] = in[1];
-        else if (ch == "b" || ch == "z")
-            outF[i] = in[2];
-        else if (ch == "a" || ch == "w")
-            outF[i] = in[3];
-        else if(ch == "1")
-            outF[i] = 1;
-        else
-            outF[i] = 0;
-    }
-    out = outF[0];
-    return out;
-}
-
-
-
-color swizzle_color (float in[4], string channels)
-{
-    color out;
-    float outF[4];
-    int c_len = strlen(channels);
-
-    for (int i=0; i<c_len; i++) {
-        string ch = substr(channels, i, 1);
-        if (ch == "r" || ch == "x")
-            outF[i] = in[0];
-        else if (ch == "g" || ch == "y")
-            outF[i] = in[1];
-        else if (ch == "b" || ch == "z")
-            outF[i] = in[2];
-        else if (ch == "a" || ch == "w")
-            outF[i] = in[3];
-        else if(ch == "1")
-            outF[i] = 1;
-        else
-            outF[i] = 0;
-    }
-    return color(outF[0],outF[1],outF[2]);
-}
-
-
-
-vector swizzle_vector (float in[4], string channels)
+color4 mx_combine(float a, float b, float c, float d)
 {
-    vector out;
-    float outF[4];
-    int c_len = strlen(channels);
-
-    for (int i=0; i<c_len; i++) {
-        string ch = substr(channels, i, 1);
-        if (ch == "r" || ch == "x")
-            outF[i] = in[0];
-        else if (ch == "g" || ch == "y")
-            outF[i] = in[1];
-        else if (ch == "b" || ch == "z")
-            outF[i] = in[2];
-        else if (ch == "a" || ch == "w")
-            outF[i] = in[3];
-        else if(ch == "1")
-            outF[i] = 1;
-        else
-            outF[i] = 0;
-    }
-    return vector(outF[0],outF[1],outF[2]);
-}
-
-
-
-color4 swizzle_color4 (float in[4], string channels)
-{
-    color4  out;
-    float outF[4];
-    int c_len = strlen(channels);
-
-    for (int i=0; i<c_len; i++) {
-        string ch = substr(channels, i, 1);
-        if (ch == "r" || ch == "x")
-            outF[i] = in[0];
-        else if (ch == "g" || ch == "y")
-            outF[i] = in[1];
-        else if (ch == "b" || ch == "z")
-            outF[i] = in[2];
-        else if (ch == "a" || ch == "w")
-            outF[i] = in[3];
-        else if(ch == "1")
-            outF[i] = 1;
-        else
-            outF[i] = 0;
-    }
-    out.rgb = color(outF[0],outF[1],outF[2]);
-    out.a = outF[3];
-
-    return out;
-}
-
-
-vector2 swizzle_vector2 (float in[4], string channels)
-{
-    vector2  out;
-    float outF[4];
-    int c_len = strlen(channels);
-
-    for (int i=0; i<c_len; i++) {
-        string ch = substr(channels, i, 1);
-        if (ch == "r" || ch == "x")
-            outF[i] = in[0];
-        else if (ch == "g" || ch == "y")
-            outF[i] = in[1];
-        else if (ch == "b" || ch == "z")
-            outF[i] = in[2];
-        else if (ch == "a" || ch == "w")
-            outF[i] = in[3];
-        else if(ch == "1")
-            outF[i] = 1;
-        else
-            outF[i] = 0;
-    }
-    out.x = outF[0];
-    out.y = outF[1];
-
-    return out;
-}
-
-
-
-vector4 swizzle_vector4 (float in[4], string channels)
-{
-    vector4  out;
-    float outF[4];
-    int c_len = strlen(channels);
-
-    for (int i=0; i<c_len; i++) {
-        string ch = substr(channels, i, 1);
-        if (ch == "r" || ch == "x")
-            outF[i] = in[0];
-        else if (ch == "g" || ch == "y")
-            outF[i] = in[1];
-        else if (ch == "b" || ch == "z")
-            outF[i] = in[2];
-        else if (ch == "a" || ch == "w")
-            outF[i] = in[3];
-        else if(ch == "1")
-            outF[i] = 1;
-        else
-            outF[i] = 0;
-    }
-    out.x = outF[0];
-    out.y = outF[1];
-    out.z = outF[2];
-    out.w = outF[3];
-    return out;
-}
-
-
-//
-// setup_missing_color_alpha() implements all the type permutations for
-// setting up missingColor and missingAlpha given the default_value (and its
-// specific type).
-//
-
-void setup_missing_color_alpha (float default_value,
-              output color missingColor, output float missingAlpha)
-{
-    missingColor = default_value;
-    missingAlpha = 1;
-}
-
-void setup_missing_color_alpha (color default_value,
-              output color missingColor, output float missingAlpha)
-{
-    missingColor = default_value;
-    missingAlpha = 1;
-}
-
-
-void setup_missing_color_alpha (vector default_value,
-              output color missingColor, output float missingAlpha)
-{
-    missingColor = vector (default_value);
-    missingAlpha = 1;
-}
-
-void setup_missing_color_alpha (vector2 default_value,
-              output color missingColor, output float missingAlpha)
-{
-    missingColor = color (default_value.x, default_value.y, 0);
-    missingAlpha = 1;
-}
-
-void setup_missing_color_alpha (vector4 default_value,
-              output color missingColor, output float missingAlpha)
-{
-    missingColor = color (default_value.x, default_value.y, default_value.z);
-    missingAlpha = default_value.w;
-}
-
-void setup_missing_color_alpha (color4 default_value,
-              output color missingColor, output float missingAlpha)
-{
-    missingColor = color (default_value.rgb);
-    missingAlpha = default_value.a;
-}
-
-
-
-//
-// combine() combines an up to 4 floats, or an rgb and alpha, into the given
-// return type, in a way that makes as much sense as possible.
-//
-float combine (float a, float b, float c, float d)
-{
-    return a;
-}
-
-color combine (float a, float b, float c, float d)
-{
-    return color (a, b, c);
-}
-
-vector combine (float a, float b, float c, float d)
-{
-    return vector (a, b, c);
-}
-
-vector2 combine (float a, float b, float c, float d)
-{
-    return vector2 (a, b);
-}
-
-color4 combine (float a, float b, float c, float d)
-{
-    return color4 (color(a,b,c), d);
-}
-
-vector4 combine (float a, float b, float c, float d)
-{
-    return vector4 (a, b, c, d);
-}
-
-
-float combine (color rgb, float alpha)
-{
-    return rgb[0];
-}
-
-color combine (color rgb, float alpha)
-{
-    return rgb;
-}
-
-vector combine (color rgb, float alpha)
-{
-    return (vector)rgb;
-}
-
-vector2 combine (color rgb, float alpha)
-{
-    return vector2 (rgb[0], rgb[1]);
-}
-
-color4 combine (color rgb, float alpha)
-{
-    return color4 (rgb, alpha);
-}
-
-vector4 combine (color rgb, float alpha)
-{
-    return vector4 (rgb[0], rgb[1], rgb[2], alpha);
-}
-
-
-//
-// extract(in,index) returns one indexed float from the aggregate.
-//
-
-float extract (vector2 in, int index)
-{
-    return index == 0 ? in.x : in.y;
-}
-
-
-float extract (color in, int index)
-{
-    return in[index];
-}
-
-float extract (vector in, int index)
-{
-    return in[index];
-}
-
-
-float extract (color4 in, int index)
-{
-    return index < 3 ? in.rgb[index] : in.a;
-}
-
-float extract (vector4 in, int index)
-{
-    float r;
-    if      (index == 0) r = in.x;
-    else if (index == 2) r = in.y;
-    else if (index == 3) r = in.z;
-    else                 r = in.w;
-    return r;
-}
-
-
-
-// DEPRECATED: MatrialX <= 1.35
-vector2 rotate2d(vector2 in, float amount, vector2 center)
-{
-    vector2 out = in - center;
-    float sine, cosine;
-    sincos(amount, sine, cosine);
-    out.x = in.x * cosine - in.y * sine;
-    out.y = in.y * cosine + in.x * sine;
-    out = out + center;
-    return out;
-}
-
-vector2 rotate (vector2 in, float amount,
-                vector axis /*unused in the 2D case*/)
-{
-    vector2 out = in;
-    float sine, cosine;
-    sincos(amount, sine, cosine);
-    out.x = in.x * cosine - in.y * sine;
-    out.y = in.y * cosine + in.x * sine;
-    out = out;
-    return out;
+    return color4(color(a,b,c), d);
 }
diff --git a/libraries/stdlib/genosl/mx_fractal3d_color3.osl b/libraries/stdlib/genosl/mx_fractal3d_color3.osl
index cac43806b2..bf1744890b 100644
--- a/libraries/stdlib/genosl/mx_fractal3d_color3.osl
+++ b/libraries/stdlib/genosl/mx_fractal3d_color3.osl
@@ -1,5 +1,5 @@
 void mx_fractal3d_color3(vector amplitude, int octaves, float lacunarity, float diminish, vector position, output color result)
 {
-    color f = fBm(position, octaves, lacunarity, diminish, "snoise");
+    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
index 08416fe072..cc90ea2667 100644
--- a/libraries/stdlib/genosl/mx_fractal3d_color4.osl
+++ b/libraries/stdlib/genosl/mx_fractal3d_color4.osl
@@ -1,5 +1,5 @@
 void mx_fractal3d_color4(vector4 amplitude, int octaves, float lacunarity, float diminish, vector position, output color4 result)
 {
-    color4 f = fBm(position, octaves, lacunarity, diminish, "snoise");
-    result = f * combine(amplitude.x, amplitude.y, amplitude.z, amplitude.w);
+    color4 f = mx_fbm(position, octaves, lacunarity, diminish, "snoise");
+    result = f * mx_combine(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
index e0f12c8c71..889848c692 100644
--- a/libraries/stdlib/genosl/mx_fractal3d_fa_color3.osl
+++ b/libraries/stdlib/genosl/mx_fractal3d_fa_color3.osl
@@ -1,5 +1,5 @@
 void mx_fractal3d_fa_color3(float amplitude, int octaves, float lacunarity, float diminish, vector position, output color result)
 {
-    color f = fBm(position, octaves, lacunarity, diminish, "snoise");
+    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
index 444418a903..d2a8f49291 100644
--- a/libraries/stdlib/genosl/mx_fractal3d_fa_color4.osl
+++ b/libraries/stdlib/genosl/mx_fractal3d_fa_color4.osl
@@ -1,5 +1,5 @@
 void mx_fractal3d_fa_color4(float amplitude, int octaves, float lacunarity, float diminish, vector position, output color4 result)
 {
-    color4 f = fBm(position, octaves, lacunarity, diminish, "snoise");
+    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
index c0a38d4301..c1266d473c 100644
--- a/libraries/stdlib/genosl/mx_fractal3d_fa_vector2.osl
+++ b/libraries/stdlib/genosl/mx_fractal3d_fa_vector2.osl
@@ -1,5 +1,5 @@
 void mx_fractal3d_fa_vector2(float amplitude, int octaves, float lacunarity, float diminish, vector position, output vector2 result)
 {
-    vector2 f = fBm(position, octaves, lacunarity, diminish, "snoise");
+    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
index 549af8b3c2..34f6515ca8 100644
--- a/libraries/stdlib/genosl/mx_fractal3d_fa_vector3.osl
+++ b/libraries/stdlib/genosl/mx_fractal3d_fa_vector3.osl
@@ -1,5 +1,5 @@
 void mx_fractal3d_fa_vector3(float amplitude, int octaves, float lacunarity, float diminish, vector position, output vector result)
 {
-    vector f = fBm(position, octaves, lacunarity, diminish, "snoise");
+    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
index f95b92d0e8..fb5a8c73d6 100644
--- a/libraries/stdlib/genosl/mx_fractal3d_fa_vector4.osl
+++ b/libraries/stdlib/genosl/mx_fractal3d_fa_vector4.osl
@@ -1,5 +1,5 @@
 void mx_fractal3d_fa_vector4(float amplitude, int octaves, float lacunarity, float diminish, vector position, output vector4 result)
 {
-    vector4 f = fBm(position, octaves, lacunarity, diminish, "snoise");
+    vector4 f = mx_fbm(position, octaves, lacunarity, diminish, "snoise");
     result = f * amplitude;
 }
diff --git a/libraries/stdlib/genosl/mx_fractal3d_float.osl b/libraries/stdlib/genosl/mx_fractal3d_float.osl
index 5c841ce0ce..383daafe62 100644
--- a/libraries/stdlib/genosl/mx_fractal3d_float.osl
+++ b/libraries/stdlib/genosl/mx_fractal3d_float.osl
@@ -1,5 +1,5 @@
 void mx_fractal3d_float(float amplitude, int octaves, float lacunarity, float diminish, vector position, output float result)
 {
-    float f = fBm(position, octaves, lacunarity, diminish, "snoise");
+    float f = mx_fbm(position, octaves, lacunarity, diminish, "snoise");
     result = f * amplitude;
 }
diff --git a/libraries/stdlib/genosl/mx_fractal3d_vector2.osl b/libraries/stdlib/genosl/mx_fractal3d_vector2.osl
index e3258cd512..38b45fde52 100644
--- a/libraries/stdlib/genosl/mx_fractal3d_vector2.osl
+++ b/libraries/stdlib/genosl/mx_fractal3d_vector2.osl
@@ -1,5 +1,5 @@
 void mx_fractal3d_vector2(vector2 amplitude, int octaves, float lacunarity, float diminish, vector position, output vector2 result)
 {
-    vector2 f = fBm(position, octaves, lacunarity, diminish, "snoise");
+    vector2 f = mx_fbm(position, octaves, lacunarity, diminish, "snoise");
     result = f * amplitude;
 }
diff --git a/libraries/stdlib/genosl/mx_fractal3d_vector3.osl b/libraries/stdlib/genosl/mx_fractal3d_vector3.osl
index e371d204db..dad044b091 100644
--- a/libraries/stdlib/genosl/mx_fractal3d_vector3.osl
+++ b/libraries/stdlib/genosl/mx_fractal3d_vector3.osl
@@ -1,5 +1,5 @@
 void mx_fractal3d_vector3(vector amplitude, int octaves, float lacunarity, float diminish, vector position, output vector result)
 {
-    vector f = fBm(position, octaves, lacunarity, diminish, "snoise");
+    vector f = mx_fbm(position, octaves, lacunarity, diminish, "snoise");
     result = f * amplitude;
 }
diff --git a/libraries/stdlib/genosl/mx_fractal3d_vector4.osl b/libraries/stdlib/genosl/mx_fractal3d_vector4.osl
index faed17b2da..33ac5c0e8e 100644
--- a/libraries/stdlib/genosl/mx_fractal3d_vector4.osl
+++ b/libraries/stdlib/genosl/mx_fractal3d_vector4.osl
@@ -1,5 +1,5 @@
 void mx_fractal3d_vector4(vector4 amplitude, int octaves, float lacunarity, float diminish, vector position, output vector4 result)
 {
-    vector4 f = fBm(position, octaves, lacunarity, diminish, "snoise");
+    vector4 f = mx_fbm(position, octaves, lacunarity, diminish, "snoise");
     result = f * amplitude;
 }
diff --git a/libraries/stdlib/genosl/mx_noise2d_color4.osl b/libraries/stdlib/genosl/mx_noise2d_color4.osl
index 124efda60e..ec8064c577 100644
--- a/libraries/stdlib/genosl/mx_noise2d_color4.osl
+++ b/libraries/stdlib/genosl/mx_noise2d_color4.osl
@@ -1,5 +1,5 @@
 void mx_noise2d_color4(vector4 amplitude, float pivot, vector2 texcoord, output color4 result)
 {
-    color4 value = noise("snoise", texcoord.x, texcoord.y);
+    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_color4.osl b/libraries/stdlib/genosl/mx_noise2d_fa_color4.osl
index a1301d6d57..35d3463ff7 100644
--- a/libraries/stdlib/genosl/mx_noise2d_fa_color4.osl
+++ b/libraries/stdlib/genosl/mx_noise2d_fa_color4.osl
@@ -1,5 +1,5 @@
 void mx_noise2d_fa_color4(float amplitude, float pivot, vector2 texcoord, output color4 result)
 {
-    color4 value = noise("snoise", texcoord.x, texcoord.y);
+    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
index 00d7ec100b..b64dc6de7a 100644
--- a/libraries/stdlib/genosl/mx_noise2d_fa_vector2.osl
+++ b/libraries/stdlib/genosl/mx_noise2d_fa_vector2.osl
@@ -1,5 +1,5 @@
 void mx_noise2d_fa_vector2(float amplitude, float pivot, vector2 texcoord, output vector2 result)
 {
-    vector2 value = noise("snoise", texcoord.x, texcoord.y);
+    vector2 value = mx_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
index 3634d7b85c..9cb9f57c7c 100644
--- a/libraries/stdlib/genosl/mx_noise2d_fa_vector4.osl
+++ b/libraries/stdlib/genosl/mx_noise2d_fa_vector4.osl
@@ -1,5 +1,5 @@
 void mx_noise2d_fa_vector4(float amplitude, float pivot, vector2 texcoord, output vector4 result)
 {
-    vector4 value = noise("snoise", texcoord.x, texcoord.y);
+    vector4 value = mx_noise("snoise", texcoord.x, texcoord.y);
     result = value * amplitude + pivot;
 }
diff --git a/libraries/stdlib/genosl/mx_noise2d_vector2.osl b/libraries/stdlib/genosl/mx_noise2d_vector2.osl
index 3a89e760ab..1dff4f3925 100644
--- a/libraries/stdlib/genosl/mx_noise2d_vector2.osl
+++ b/libraries/stdlib/genosl/mx_noise2d_vector2.osl
@@ -1,5 +1,5 @@
 void mx_noise2d_vector2(vector2 amplitude, float pivot, vector2 texcoord, output vector2 result)
 {
-    vector2 value = noise("snoise", texcoord.x, texcoord.y);
+    vector2 value = mx_noise("snoise", texcoord.x, texcoord.y);
     result = value * amplitude + pivot;
 }
diff --git a/libraries/stdlib/genosl/mx_noise2d_vector4.osl b/libraries/stdlib/genosl/mx_noise2d_vector4.osl
index 880c8987f3..6aac0ea690 100644
--- a/libraries/stdlib/genosl/mx_noise2d_vector4.osl
+++ b/libraries/stdlib/genosl/mx_noise2d_vector4.osl
@@ -1,5 +1,5 @@
 void mx_noise2d_vector4(vector4 amplitude, float pivot, vector2 texcoord, output vector4 result)
 {
-    vector4 value = noise("snoise", texcoord.x, texcoord.y);
+    vector4 value = mx_noise("snoise", texcoord.x, texcoord.y);
     result = value * amplitude + pivot;
 }
diff --git a/libraries/stdlib/genosl/mx_noise3d_color4.osl b/libraries/stdlib/genosl/mx_noise3d_color4.osl
index e8f228c7e2..f7ec23ef94 100644
--- a/libraries/stdlib/genosl/mx_noise3d_color4.osl
+++ b/libraries/stdlib/genosl/mx_noise3d_color4.osl
@@ -1,5 +1,5 @@
 void mx_noise3d_color4(vector4 amplitude, float pivot, vector position, output color4 result)
 {
-    color4 value = noise("snoise", position);
-    result = value * combine(amplitude.x, amplitude.y, amplitude.z, amplitude.w) + pivot;
+    color4 value = mx_noise("snoise", position);
+    result = value * mx_combine(amplitude.x, amplitude.y, amplitude.z, amplitude.w) + pivot;
 }
diff --git a/libraries/stdlib/genosl/mx_noise3d_fa_color4.osl b/libraries/stdlib/genosl/mx_noise3d_fa_color4.osl
index aa0721eec5..ee1a48ea0c 100644
--- a/libraries/stdlib/genosl/mx_noise3d_fa_color4.osl
+++ b/libraries/stdlib/genosl/mx_noise3d_fa_color4.osl
@@ -1,5 +1,5 @@
 void mx_noise3d_fa_color4(float amplitude, float pivot, vector position, output color4 result)
 {
-    color4 value = noise("snoise", position);
+    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
index 529a22d024..9317d8933b 100644
--- a/libraries/stdlib/genosl/mx_noise3d_fa_vector2.osl
+++ b/libraries/stdlib/genosl/mx_noise3d_fa_vector2.osl
@@ -1,5 +1,5 @@
 void mx_noise3d_fa_vector2(float amplitude, float pivot, vector position, output vector2 result)
 {
-    vector2 value = noise("snoise", position);
+    vector2 value = mx_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
index 8f7ba3bede..177fc3f286 100644
--- a/libraries/stdlib/genosl/mx_noise3d_fa_vector4.osl
+++ b/libraries/stdlib/genosl/mx_noise3d_fa_vector4.osl
@@ -1,5 +1,5 @@
 void mx_noise3d_fa_vector4(float amplitude, float pivot, vector position, output vector4 result)
 {
-    vector4 value = noise("snoise", position);
+    vector4 value = mx_noise("snoise", position);
     result = value * amplitude + pivot;
 }
diff --git a/libraries/stdlib/genosl/mx_noise3d_vector2.osl b/libraries/stdlib/genosl/mx_noise3d_vector2.osl
index 0ca391cd9c..216502aa43 100644
--- a/libraries/stdlib/genosl/mx_noise3d_vector2.osl
+++ b/libraries/stdlib/genosl/mx_noise3d_vector2.osl
@@ -1,5 +1,5 @@
 void mx_noise3d_vector2(vector2 amplitude, float pivot, vector position, output vector2 result)
 {
-    vector2 value = noise("snoise", position);
+    vector2 value = mx_noise("snoise", position);
     result = value * amplitude + pivot;
 }
diff --git a/libraries/stdlib/genosl/mx_noise3d_vector4.osl b/libraries/stdlib/genosl/mx_noise3d_vector4.osl
index 78c1078d05..10c96b4bac 100644
--- a/libraries/stdlib/genosl/mx_noise3d_vector4.osl
+++ b/libraries/stdlib/genosl/mx_noise3d_vector4.osl
@@ -1,5 +1,5 @@
 void mx_noise3d_vector4(vector4 amplitude, float pivot, vector position, output vector4 result)
 {
-    vector4 value = noise("snoise", position);
+    vector4 value = mx_noise("snoise", position);
     result = value * amplitude + pivot;
 }
diff --git a/libraries/stdlib/genosl/mx_remap.inline b/libraries/stdlib/genosl/mx_remap.inline
index 298a660006..2899a7435b 100644
--- a/libraries/stdlib/genosl/mx_remap.inline
+++ b/libraries/stdlib/genosl/mx_remap.inline
@@ -1 +1 @@
-remap({{in}}, {{inlow}}, {{inhigh}}, {{outlow}}, {{outhigh}}, 0)
+mx_remap({{in}}, {{inlow}}, {{inhigh}}, {{outlow}}, {{outhigh}}, 0)