summaryrefslogtreecommitdiffstats
path: root/cc/gl_renderer.cc
diff options
context:
space:
mode:
authorvmpstr@chromium.org <vmpstr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-16 09:35:57 +0000
committervmpstr@chromium.org <vmpstr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-16 09:35:57 +0000
commit680db2e8d01b31076e99286e7715d2065b804f2e (patch)
tree0051756a27cf267014d19518ed6c5c64ab038075 /cc/gl_renderer.cc
parentfc179dd1b6742988ee4d130af96f7ed922c14f12 (diff)
downloadchromium_src-680db2e8d01b31076e99286e7715d2065b804f2e.zip
chromium_src-680db2e8d01b31076e99286e7715d2065b804f2e.tar.gz
chromium_src-680db2e8d01b31076e99286e7715d2065b804f2e.tar.bz2
cc: Fix a bunch of gl unknown location errors
I think texScale uniform here might be getting optimized away since neither texScale nor v_texCoord is used in the fragment shader (this code path is for solid color programs only) I also tried getting the new uniform location here and got -1. BUG=196663 Review URL: https://chromiumcodereview.appspot.com/12529011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@188563 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/gl_renderer.cc')
-rw-r--r--cc/gl_renderer.cc2
1 files changed, 0 insertions, 2 deletions
diff --git a/cc/gl_renderer.cc b/cc/gl_renderer.cc
index 1a3e83a..90544ff 100644
--- a/cc/gl_renderer.cc
+++ b/cc/gl_renderer.cc
@@ -983,8 +983,6 @@ void GLRenderer::DrawSolidColorQuad(const DrawingFrame& frame,
(SkColorGetB(color) * (1.0f / 255.0f)) * alpha,
alpha));
- GLC(Context(), Context()->uniform2f(uniforms.tex_scale_location, 1.0f, 1.0f));
-
if (use_aa)
GLC(Context(), Context()->uniform3fv(uniforms.edge_location, 8, edge));