commit 84c94c0dfd1e12e97d8a835882dda575f36e41d2
author joshualitt <joshualitt@chromium.org> Mon Oct 27 15:33:33 2014 -0700
committer Commit bot <commit-bot@chromium.org> Mon Oct 27 15:33:33 2014 -0700
tree 7992422b87bb7f3997c4525b3d21dc342b4ce2d4
parent 76993edbe5dbbde07a843507184abf90c64d9928

Working patch to remove constant attributes.  This may cause some gm mismatches, I will rebaseline tonight.

BUG=skia:

Review URL: https://codereview.chromium.org/678073005

src/gpu/gl/GrGLProgramDesc.cpp

diff --git a/src/gpu/gl/GrGLProgramDesc.cpp b/src/gpu/gl/GrGLProgramDesc.cpp
index 7908813..733de13 100644
--- a/src/gpu/gl/GrGLProgramDesc.cpp
+++ b/src/gpu/gl/GrGLProgramDesc.cpp
@@ -257,8 +257,8 @@
 
     header->fEmitsPointSize = GrGpu::kDrawPoints_DrawType == drawType;
 
-    if (gpu->caps()->pathRenderingSupport() &&
-        GrGpu::IsPathRenderingDrawType(drawType) &&
+    bool isPathRendering = GrGpu::IsPathRenderingDrawType(drawType);
+    if (gpu->caps()->pathRenderingSupport() && isPathRendering &&
         gpu->glPathRendering()->texturingMode() == GrGLPathRendering::FixedFunction_TexturingMode) {
         header->fUseFragShaderOnly = true;
         SkASSERT(!optState.hasGeometryProcessor());
@@ -266,12 +266,15 @@
         header->fUseFragShaderOnly = false;
     }
 
-    bool defaultToUniformInputs = GrGpu::IsPathRenderingDrawType(drawType) ||
-                                  GR_GL_NO_CONSTANT_ATTRIBUTES;
+    bool hasUniformColor = inputColorIsUsed &&
+                           (isPathRendering || !optState.hasColorVertexAttribute());
+
+    bool hasUniformCoverage = inputCoverageIsUsed &&
+                              (isPathRendering || !optState.hasCoverageVertexAttribute());
 
     if (!inputColorIsUsed) {
         header->fColorInput = kAllOnes_ColorInput;
-    } else if (defaultToUniformInputs && !optState.hasColorVertexAttribute()) {
+    } else if (hasUniformColor) {
         header->fColorInput = kUniform_ColorInput;
     } else {
         header->fColorInput = kAttribute_ColorInput;
@@ -283,7 +286,7 @@
 
     if (covIsSolidWhite || !inputCoverageIsUsed) {
         header->fCoverageInput = kAllOnes_ColorInput;
-    } else if (defaultToUniformInputs && !optState.hasCoverageVertexAttribute()) {
+    } else if (hasUniformCoverage) {
         header->fCoverageInput = kUniform_ColorInput;
     } else {
         header->fCoverageInput = kAttribute_ColorInput;