From 72e7f2dfdb91a139d620105d5de57ded9e9ba53b Mon Sep 17 00:00:00 2001
From: archmoj <mojtaba@plot.ly>
Date: Mon, 23 Aug 2021 13:00:48 -0400
Subject: [PATCH] use maskTexture name and move samplers uniforms to the end

---
 src/traces/parcoords/lines.js            | 2 +-
 src/traces/parcoords/shaders/vertex.glsl | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/traces/parcoords/lines.js b/src/traces/parcoords/lines.js
index fc1440edfaa..ab753558c67 100644
--- a/src/traces/parcoords/lines.js
+++ b/src/traces/parcoords/lines.js
@@ -351,7 +351,7 @@ module.exports = function(canvasGL, d) {
             hiD: regl.prop('hiD'),
             palette: paletteTexture,
             contextColor: regl.prop('contextColor'),
-            mask: regl.prop('maskTexture'),
+            maskTexture: regl.prop('maskTexture'),
             drwLayer: regl.prop('drwLayer'),
             maskHeight: regl.prop('maskHeight')
         },
diff --git a/src/traces/parcoords/shaders/vertex.glsl b/src/traces/parcoords/shaders/vertex.glsl
index 373f966c87d..108667047d8 100644
--- a/src/traces/parcoords/shaders/vertex.glsl
+++ b/src/traces/parcoords/shaders/vertex.glsl
@@ -11,10 +11,10 @@ uniform mat4 dim0A, dim1A, dim0B, dim1B, dim0C, dim1C, dim0D, dim1D,
              loA, hiA, loB, hiB, loC, hiC, loD, hiD;
 
 uniform vec2 resolution, viewBoxPos, viewBoxSize;
-uniform sampler2D mask, palette;
 uniform float maskHeight;
 uniform float drwLayer; // 0: context, 1: focus, 2: pick
 uniform vec4 contextColor;
+uniform sampler2D maskTexture, palette;
 
 bool isPick    = (drwLayer > 1.5);
 bool isContext = (drwLayer < 0.5);
@@ -76,7 +76,7 @@ bool outsideRasterMask(mat4 A, mat4 B, mat4 C, mat4 D) {
         for(int j = 0; j < 4; ++j) {
             for(int k = 0; k < 4; ++k) {
                 if(0 == iMod(
-                    int(255.0 * texture2D(mask,
+                    int(255.0 * texture2D(maskTexture,
                         vec2(
                             (float(i * 2 + j / 2) + 0.5) / 8.0,
                             (pnts[i][j][k] * (maskHeight - 1.0) + 1.0) / maskHeight