unify transmitted texture coordinate name

Change-Id: I8c45ffeb6eb62ebe4d08214cccaaad6237621276

7 files changed, 17 insertions, 14 deletions

diff --git a/canvas/opengl/dummyVertexShader.glsl b/canvas/opengl/dummyVertexShader.glsl
index 2948ee9b5480..5efc9f8c5f18 100644
--- a/canvas/opengl/dummyVertexShader.glsl
+++ b/canvas/opengl/dummyVertexShader.glsl
@@ -6,11 +6,14 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-
+ 
+uniform mat4 MVP;
+attribute vec2 vPosition;
+attribute vec2 vPosition;
 varying vec2 v_textureCoords2d;
 void main(void)
 {
-    gl_Position = ftransform();
+    gl_Position = MVP * vec4(vPosition,1,1);
     v_textureCoords2d = gl_MultiTexCoord0.st;
 }
 
diff --git a/canvas/opengl/linearMultiColorGradientFragmentShader.glsl b/canvas/opengl/linearMultiColorGradientFragmentShader.glsl
index 7ad881368ac5..bf161f6486d7 100644
--- a/canvas/opengl/linearMultiColorGradientFragmentShader.glsl
+++ b/canvas/opengl/linearMultiColorGradientFragmentShader.glsl
@@ -13,7 +13,7 @@ uniform int       i_nColors;
 uniform sampler1D t_colorArray4d;
 uniform sampler1D t_stopArray1d;
 uniform mat3x2    m_transform;
-varying vec2      v_textureCoords2d;
+varying vec2     textCoords;
 
 int max(int x, int y)
 {
@@ -34,7 +34,7 @@ int findBucket(float t)
 void main(void)
 {
     float fAlpha =
-        clamp( (m_transform * vec3(v_textureCoords2d,1)).s,
+        clamp( (m_transform * vec3(textCoords,1)).s,
                 0.0, 1.0 );
 
     int nMinBucket = findBucket( fAlpha );
diff --git a/canvas/opengl/linearTwoColorGradientFragmentShader.glsl b/canvas/opengl/linearTwoColorGradientFragmentShader.glsl
index 8659bfd1166c..267b1248ed7f 100644
--- a/canvas/opengl/linearTwoColorGradientFragmentShader.glsl
+++ b/canvas/opengl/linearTwoColorGradientFragmentShader.glsl
@@ -12,14 +12,14 @@
 uniform vec4   v_startColor4d;
 uniform vec4   v_endColor4d;
 uniform mat3x2 m_transform;
-varying vec2   v_textureCoords2d;
+varying vec2   textCoords;
 
 void main(void)
 {
     gl_FragColor = mix(v_startColor4d,
             v_endColor4d,
             clamp(
-                (m_transform * vec3(v_textureCoords2d,1)).s,
+                (m_transform*vec3(textCoords,1)).s,
                 0.0, 1.0));
 }
 
diff --git a/canvas/opengl/radialMultiColorGradientFragmentShader.glsl b/canvas/opengl/radialMultiColorGradientFragmentShader.glsl
index ebc6d6f5fe10..8de4111f3227 100644
--- a/canvas/opengl/radialMultiColorGradientFragmentShader.glsl
+++ b/canvas/opengl/radialMultiColorGradientFragmentShader.glsl
@@ -13,7 +13,7 @@ uniform int       i_nColors;
 uniform sampler1D t_colorArray4d;
 uniform sampler1D t_stopArray1d;
 uniform mat3x2    m_transform;
-varying vec2      v_textureCoords2d;
+varying vec2     textCoords;
 const vec2        v_center2d = vec2(0,0);
 
 int max(int x, int y)
@@ -36,7 +36,7 @@ void main(void)
 {
     float fAlpha =
         clamp( 1.0 - distance(
-                    vec2( m_transform * vec3(v_textureCoords2d,1)),
+                    vec2( m_transform * vec3(textCoords,1)),
                     v_center2d),
                 0.0, 1.0 );
 
diff --git a/canvas/opengl/radialTwoColorGradientFragmentShader.glsl b/canvas/opengl/radialTwoColorGradientFragmentShader.glsl
index a5d613454b11..2a7d9c7dc083 100644
--- a/canvas/opengl/radialTwoColorGradientFragmentShader.glsl
+++ b/canvas/opengl/radialTwoColorGradientFragmentShader.glsl
@@ -12,7 +12,7 @@
 uniform vec4   v_startColor4d;
 uniform vec4   v_endColor4d;
 uniform mat3x2 m_transform;
-varying vec2   v_textureCoords2d;
+varying vec2   textCoords;
 const vec2     v_center2d = vec2(0,0);
 
 void main(void)
@@ -21,7 +21,7 @@ void main(void)
             v_endColor4d,
             1.0 - distance(
                 vec2(
-                    m_transform * vec3(v_textureCoords2d,1)),
+                    m_transform * vec3(textCoords,1)),
                 v_center2d));
     }
 
diff --git a/canvas/opengl/rectangularMultiColorGradientFragmentShader.glsl b/canvas/opengl/rectangularMultiColorGradientFragmentShader.glsl
index 331e57adcb9f..8a343fd5478c 100644
--- a/canvas/opengl/rectangularMultiColorGradientFragmentShader.glsl
+++ b/canvas/opengl/rectangularMultiColorGradientFragmentShader.glsl
@@ -13,7 +13,7 @@ uniform int       i_nColors;
 uniform sampler1D t_colorArray4d;
 uniform sampler1D t_stopArray1d;
 uniform mat3x2    m_transform;
-varying vec2      v_textureCoords2d;
+varying vec2      textCoords; 
 
 int maxInt(int x, int y)
 {
@@ -33,7 +33,7 @@ int findBucket(float t)
 
 void main(void)
 {
-    vec2  v = abs( vec2(m_transform * vec3(v_textureCoords2d,1)) );
+    vec2  v = abs( vec2(m_transform * vec3(textCoords,1)) );
     float fAlpha = 1.0 - max(v.x, v.y);
 
     int nMinBucket=findBucket( fAlpha );
diff --git a/canvas/opengl/rectangularTwoColorGradientFragmentShader.glsl b/canvas/opengl/rectangularTwoColorGradientFragmentShader.glsl
index 038cdffd24ad..be779af15a81 100644
--- a/canvas/opengl/rectangularTwoColorGradientFragmentShader.glsl
+++ b/canvas/opengl/rectangularTwoColorGradientFragmentShader.glsl
@@ -12,10 +12,10 @@
 uniform vec4   v_startColor4d;
 uniform vec4   v_endColor4d;
 uniform mat3x2 m_transform;
-varying vec2   v_textureCoords2d;
+varying vec2   textCoords;
 void main(void)
 {
-    vec2 v = abs( vec2(m_transform * vec3(v_textureCoords2d,1)) );
+    vec2 v = abs( vec2(m_transform * vec3(textCoords,1)) );
     float t = max(v.x, v.y);
     gl_FragColor = mix(v_startColor4d,
             v_endColor4d,