Revert "cc: Clamp texture coordinates in all tile shaders"

cc/shader.cc

 // Copyright 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/shader.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h"
 
@@ skipping 327 matching lines @@
     };
     int locations[2];
 
     getProgramUniformLocations(context, program, shaderUniforms, arraysize(shaderUniforms), arraysize(locations), locations, usingBindUniform, baseUniformIndex);
 
     m_samplerLocation = locations[0];
     m_alphaLocation = locations[1];
     DCHECK(m_samplerLocation != -1 && m_alphaLocation != -1);
 }
 
-FragmentTexClampAlphaBinding::FragmentTexClampAlphaBinding()
-    : m_samplerLocation(-1)
-    , m_alphaLocation(-1)
-    , m_fragmentTexTransformLocation(-1)
-{
-}
-
-void FragmentTexClampAlphaBinding::init(WebGraphicsContext3D* context, unsigned program, bool usingBindUniform, int* baseUniformIndex)
-{
-    static const char* shaderUniforms[] = {
-        "s_texture",
-        "alpha",
-        "fragmentTexTransform",
-    };
-    int locations[3];
-
-    getProgramUniformLocations(context, program, shaderUniforms, arraysize(shaderUniforms), arraysize(locations), locations, usingBindUniform, baseUniformIndex);
-
-    m_samplerLocation = locations[0];
-    m_alphaLocation = locations[1];
-    m_fragmentTexTransformLocation = locations[2];
-    DCHECK(m_samplerLocation != -1 && m_alphaLocation != -1);
-}
-
-
 FragmentTexOpaqueBinding::FragmentTexOpaqueBinding()
     : m_samplerLocation(-1)
 {
 }
 
 void FragmentTexOpaqueBinding::init(WebGraphicsContext3D* context, unsigned program, bool usingBindUniform, int* baseUniformIndex)
 {
     static const char* shaderUniforms[] = {
         "s_texture",
     };
     int locations[1];
 
     getProgramUniformLocations(context, program, shaderUniforms, arraysize(shaderUniforms), arraysize(locations), locations, usingBindUniform, baseUniformIndex);
 
     m_samplerLocation = locations[0];
     DCHECK(m_samplerLocation != -1);
 }
 
-FragmentTexClampOpaqueBinding::FragmentTexClampOpaqueBinding()
-    : m_samplerLocation(-1)
-    , m_fragmentTexTransformLocation(-1)
-{
-}
-
-void FragmentTexClampOpaqueBinding::init(WebGraphicsContext3D* context, unsigned program, bool usingBindUniform, int* baseUniformIndex)
-{
-    static const char* shaderUniforms[] = {
-        "s_texture",
-        "fragmentTexTransform",
-    };
-    int locations[2];
-
-    getProgramUniformLocations(context, program, shaderUniforms, arraysize(shaderUniforms), arraysize(locations), locations, usingBindUniform, baseUniformIndex);
-
-    m_samplerLocation = locations[0];
-    m_fragmentTexTransformLocation = locations[1];
-    DCHECK(m_samplerLocation != -1);
-}
-
 std::string FragmentShaderRGBATexFlipVaryingAlpha::getShaderString() const
 {
     return SHADER(
         precision mediump float;
         varying vec2 v_texCoord;
         varying float v_alpha;
         uniform sampler2D s_texture;
         void main()
         {
             vec4 texColor = texture2D(s_texture, vec2(v_texCoord.x, 1.0 - v_texCoord.y));
@@ skipping 37 matching lines @@
         uniform sampler2D s_texture;
         uniform float alpha;
         void main()
         {
             vec4 texColor = texture2D(s_texture, v_texCoord);
             gl_FragColor = texColor * alpha;
         }
     );
 }
 
-std::string FragmentShaderRGBATexClampAlpha::getShaderString() const
-{
-    return SHADER(
-        precision mediump float;
-        varying vec2 v_texCoord;
-        uniform sampler2D s_texture;
-        uniform float alpha;
-        uniform vec4 fragmentTexTransform;
-        void main()
-        {
-            vec2 texCoord = clamp(v_texCoord, 0.0, 1.0) * fragmentTexTransform.zw + fragmentTexTransform.xy;
-            vec4 texColor = texture2D(s_texture, texCoord);
-            gl_FragColor = texColor * alpha;
-        }
-    );
-}
-
-
 std::string FragmentShaderRGBATexVaryingAlpha::getShaderString() const
 {
     return SHADER(
         precision mediump float;
         varying vec2 v_texCoord;
         varying float v_alpha;
         uniform sampler2D s_texture;
         void main()
         {
             vec4 texColor = texture2D(s_texture, v_texCoord);
@@ skipping 26 matching lines @@
             "varying vec2 v_texCoord;\n"
             "varying float v_alpha;\n"
             "uniform sampler2DRect s_texture;\n"
             "void main()\n"
             "{\n"
             "    vec4 texColor = texture2DRect(s_texture, v_texCoord);\n"
             "    gl_FragColor = texColor * v_alpha;\n"
             "}\n";
 }
 
-std::string FragmentShaderRGBATexClampOpaque::getShaderString() const
+std::string FragmentShaderRGBATexOpaque::getShaderString() const
 {
     return SHADER(
         precision mediump float;
         varying vec2 v_texCoord;
         uniform sampler2D s_texture;
-        uniform vec4 fragmentTexTransform;
         void main()
         {
-            vec2 texCoord = clamp(v_texCoord, 0.0, 1.0) * fragmentTexTransform.zw + fragmentTexTransform.xy;
-            vec4 texColor = texture2D(s_texture, texCoord);
+            vec4 texColor = texture2D(s_texture, v_texCoord);
             gl_FragColor = vec4(texColor.rgb, 1.0);
         }
     );
 }
 
 std::string FragmentShaderRGBATex::getShaderString() const
 {
     return SHADER(
         precision mediump float;
         varying vec2 v_texCoord;
         uniform sampler2D s_texture;
         void main()
         {
             gl_FragColor = texture2D(s_texture, v_texCoord);
         }
     );
 }
 
-std::string FragmentShaderRGBATexClampSwizzleAlpha::getShaderString() const
+std::string FragmentShaderRGBATexSwizzleAlpha::getShaderString() const
 {
     return SHADER(
         precision mediump float;
         varying vec2 v_texCoord;
         uniform sampler2D s_texture;
         uniform float alpha;
-        uniform vec4 fragmentTexTransform;
         void main()
         {
-            vec2 texCoord = clamp(v_texCoord, 0.0, 1.0) * fragmentTexTransform.zw + fragmentTexTransform.xy;
-            vec4 texColor = texture2D(s_texture, texCoord);
+            vec4 texColor = texture2D(s_texture, v_texCoord);
             gl_FragColor = vec4(texColor.z, texColor.y, texColor.x, texColor.w) * alpha;
         }
     );
 }
 
-std::string FragmentShaderRGBATexClampSwizzleOpaque::getShaderString() const
+std::string FragmentShaderRGBATexSwizzleOpaque::getShaderString() const
 {
     return SHADER(
         precision mediump float;
         varying vec2 v_texCoord;
         uniform sampler2D s_texture;
-        uniform vec4 fragmentTexTransform;
         void main()
         {
-            vec2 texCoord = clamp(v_texCoord, 0.0, 1.0) * fragmentTexTransform.zw + fragmentTexTransform.xy;
-            vec4 texColor = texture2D(s_texture, texCoord);
+            vec4 texColor = texture2D(s_texture, v_texCoord);
             gl_FragColor = vec4(texColor.z, texColor.y, texColor.x, 1.0);
         }
     );
 }
 
 FragmentShaderRGBATexAlphaAA::FragmentShaderRGBATexAlphaAA()
     : m_samplerLocation(-1)
     , m_alphaLocation(-1)
     , m_edgeLocation(-1)
 {
@@ skipping 366 matching lines @@
             vec4 color2 = color;
             vec2 texCoord = clamp(v_texCoord, 0.0, 1.0) * texTransform.zw + texTransform.xy;
             vec2 coord = mod(floor(texCoord * frequency * 2.0), 2.0);
             float picker = abs(coord.x - coord.y);
             gl_FragColor = mix(color1, color2, picker) * alpha;
         }
     );
 }
 
 }  // namespace cc