summaryrefslogtreecommitdiffstats
path: root/cc
diff options
context:
space:
mode:
authorreveman@chromium.org <reveman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-27 18:13:16 +0000
committerreveman@chromium.org <reveman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-27 18:13:16 +0000
commitc7b65c480511ef7f9319a03b93a3cdcce5fee3b3 (patch)
tree3747e51e2ceae80f9638e4e2e1fe2bbd22f7b7ba /cc
parent00b50b22e8bc53c68e655662d36c10c986e45b9c (diff)
downloadchromium_src-c7b65c480511ef7f9319a03b93a3cdcce5fee3b3.zip
chromium_src-c7b65c480511ef7f9319a03b93a3cdcce5fee3b3.tar.gz
chromium_src-c7b65c480511ef7f9319a03b93a3cdcce5fee3b3.tar.bz2
Revert 189892 "cc: Use different name for "point" uniform until ..."
crbug.com/223014 has been fixed. This workaround is no longer neeeded. > cc: Use different name for "point" uniform until crbug.com/223014 has been resolved. > > BUG=218873 > NOTRY=true > > > Review URL: https://chromiumcodereview.appspot.com/13008010 TBR=jamesr@chromium.org Review URL: https://codereview.chromium.org/13044011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190979 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc')
-rw-r--r--cc/output/shader.cc26
1 files changed, 12 insertions, 14 deletions
diff --git a/cc/output/shader.cc b/cc/output/shader.cc
index 0200b6d..428e125 100644
--- a/cc/output/shader.cc
+++ b/cc/output/shader.cc
@@ -249,11 +249,9 @@ void VertexShaderQuad::Init(WebGraphicsContext3D* context,
unsigned program,
bool using_bind_uniform,
int* base_uniform_index) {
- // TODO(reveman): Some uniform names are causing drawing artifact.
- // crbug.com/223014
static const char* shader_uniforms[] = {
"matrix",
- "point_bug223014",
+ "point",
"texScale",
};
int locations[3];
@@ -280,16 +278,16 @@ std::string VertexShaderQuad::GetShaderString() const {
attribute vec4 a_position;
attribute vec2 a_texCoord;
uniform mat4 matrix;
- uniform vec2 point_bug223014[4];
+ uniform vec2 point[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_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];
+ 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];
gl_Position = matrix * pos;
v_texCoord = (pos.xy + vec2(0.5)) * texScale;
}
@@ -307,7 +305,7 @@ void VertexShaderTile::Init(WebGraphicsContext3D* context,
int* base_uniform_index) {
static const char* shader_uniforms[] = {
"matrix",
- "point_bug223014",
+ "point",
"vertexTexTransform",
};
int locations[3];
@@ -333,16 +331,16 @@ std::string VertexShaderTile::GetShaderString() const {
attribute vec4 a_position;
attribute vec2 a_texCoord;
uniform mat4 matrix;
- uniform vec2 point_bug223014[4];
+ uniform vec2 point[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_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];
+ 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];
gl_Position = matrix * pos;
v_texCoord = pos.xy * vertexTexTransform.zw + vertexTexTransform.xy;
}