aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-05-21 21:44:59 +0000
committerGravatar bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-05-21 21:44:59 +0000
commit255fa16facc94ffa7475775ce7484d85b257fa13 (patch)
tree0cb1199a40d9347fd20d614e6df5858dc13a9854 /src
parent8d49d93bb33a9594a9e4a9c12e3261f47d151218 (diff)
Changes accidentally omitted from 4022.
git-svn-id: http://skia.googlecode.com/svn/trunk@4023 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src')
-rw-r--r--src/gpu/gl/GrGpuGLShaders.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gpu/gl/GrGpuGLShaders.cpp b/src/gpu/gl/GrGpuGLShaders.cpp
index 32f021f29a..30b260b340 100644
--- a/src/gpu/gl/GrGpuGLShaders.cpp
+++ b/src/gpu/gl/GrGpuGLShaders.cpp
@@ -613,7 +613,7 @@ void GrGpuGLShaders::flushColor(GrColor color) {
} else {
switch (desc.fColorInput) {
case ProgramDesc::kAttribute_ColorInput:
- if (fHWDrawState.getColor() != color) {
+ if (fHWConstAttribColor != color) {
// OpenGL ES only supports the float varieties of
// glVertexAttrib
float c[] = GR_COLOR_TO_VEC4(color);
@@ -663,7 +663,7 @@ void GrGpuGLShaders::flushCoverage(GrColor coverage) {
} else {
switch (desc.fCoverageInput) {
case ProgramDesc::kAttribute_ColorInput:
- if (fHWDrawState.getCoverage() != coverage) {
+ if (fHWConstAttribCoverage != coverage) {
// OpenGL ES only supports the float varieties of
// glVertexAttrib
float c[] = GR_COLOR_TO_VEC4(coverage);