cc: Use different name for "point" uniform until crbug.com/223014 has been resolved.

cc: Use different name for "point" uniform until crbug.com/223014 has been resolved.

BUG=218873
NOTRY=true


Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=189892

[jamesr, 2013-03-22 04:15:44]

lgtm
 On Mar 21, 2013 8:55 PM, <reveman@chromium.org> wrote:

> Reviewers: jamesr, ernstm,
>
> Description:
> cc: Use different name for "point" uniform until crbug.com/223014 has been
> resolved.
>
> BUG=218873
>
>
> Please review this at
https://codereview.chromium.**org/13008010/<https://codereview.chromium.org/1...
>
> SVN Base:
svn://svn.chromium.org/chrome/**trunk/src<http://svn.chromium.org/chrome/trunk/src>
>
> Affected files:
>   M cc/output/shader.cc
>
>
> Index: cc/output/shader.cc
> diff --git a/cc/output/shader.cc b/cc/output/shader.cc
> index c4ca0a9f35cd9a1f782457fb8fd893**f67a466f70..**
> c4d3636284fedfcf34bc22cebd4f07**85817e5bf3 100644
> --- a/cc/output/shader.cc
> +++ b/cc/output/shader.cc
> @@ -222,9 +222,11 @@ VertexShaderQuad::**VertexShaderQuad()
>
>  void VertexShaderQuad::init(**WebGraphicsContext3D* context, unsigned
> program, bool usingBindUniform, int* baseUniformIndex)
>  {
> +    // TODO(reveman): Some uniform names are causing drawing artifact.
> +    // crbug.com/223014
>      static const char* shaderUniforms[] = {
>          "matrix",
> -        "point",
> +        "point_bug223014",
>          "texScale",
>      };
>      int locations[3];
> @@ -245,17 +247,17 @@ std::string VertexShaderQuad::**getShaderString()
> const
>          attribute vec4 a_position;
>          attribute vec2 a_texCoord;
>          uniform mat4 matrix;
> -        uniform vec2 point[4];
> +        uniform vec2 point_bug223014[4];
>          uniform vec2 texScale;
>          varying vec2 v_texCoord;
>          void main()
>          {
>              vec2 complement = abs(a_texCoord - 1.0);
>              vec4 pos = vec4(0.0, 0.0, a_position.z, a_position.w);
> -            pos.xy += (complement.x * complement.y) * point[0];
> -            pos.xy += (a_texCoord.x * complement.y) * point[1];
> -            pos.xy += (a_texCoord.x * a_texCoord.y) * point[2];
> -            pos.xy += (complement.x * a_texCoord.y) * point[3];
> +            pos.xy += (complement.x * complement.y) * point_bug223014[0];
> +            pos.xy += (a_texCoord.x * complement.y) * point_bug223014[1];
> +            pos.xy += (a_texCoord.x * a_texCoord.y) * point_bug223014[2];
> +            pos.xy += (complement.x * a_texCoord.y) * point_bug223014[3];
>              gl_Position = matrix * pos;
>              v_texCoord = (pos.xy + vec2(0.5)) * texScale;
>          }
> @@ -273,7 +275,7 @@ void VertexShaderTile::init(**WebGraphicsContext3D*
> context, unsigned program, boo
>  {
>      static const char* shaderUniforms[] = {
>          "matrix",
> -        "point",
> +        "point_bug223014",
>          "vertexTexTransform",
>      };
>      int locations[3];
> @@ -292,17 +294,17 @@ std::string VertexShaderTile::**getShaderString()
> const
>          attribute vec4 a_position;
>          attribute vec2 a_texCoord;
>          uniform mat4 matrix;
> -        uniform vec2 point[4];
> +        uniform vec2 point_bug223014[4];
>          uniform vec4 vertexTexTransform;
>          varying vec2 v_texCoord;
>          void main()
>          {
>              vec2 complement = abs(a_texCoord - 1.0);
>              vec4 pos = vec4(0.0, 0.0, a_position.z, a_position.w);
> -            pos.xy += (complement.x * complement.y) * point[0];
> -            pos.xy += (a_texCoord.x * complement.y) * point[1];
> -            pos.xy += (a_texCoord.x * a_texCoord.y) * point[2];
> -            pos.xy += (complement.x * a_texCoord.y) * point[3];
> +            pos.xy += (complement.x * complement.y) * point_bug223014[0];
> +            pos.xy += (a_texCoord.x * complement.y) * point_bug223014[1];
> +            pos.xy += (a_texCoord.x * a_texCoord.y) * point_bug223014[2];
> +            pos.xy += (complement.x * a_texCoord.y) * point_bug223014[3];
>              gl_Position = matrix * pos;
>              v_texCoord = pos.xy * vertexTexTransform.zw +
> vertexTexTransform.xy;
>          }
>
>
>

[commit-bot: I haz the power, 2013-03-22 16:07:28]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/reveman@chromium.org/13008010/1

[commit-bot: I haz the power, 2013-03-22 16:50:24]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/reveman@chromium.org/13008010/1

[reveman, 2013-03-22 17:46:20]

fyi, not sure why builds show as red. the emails sent to me show them
succeeding. a few bots succeeding should be enough for this change. i will land
it manually.

[commit-bot: I haz the power, 2013-03-22 19:21:14]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/reveman@chromium.org/13008010/1

[commit-bot: I haz the power, 2013-03-22 20:07:12]

Change committed as 189892