commit 2dd1ae016d7f297b433c3ea3a771ef8e01657c1f
author joshualitt <joshualitt@chromium.org> Wed Dec 03 06:24:10 2014 -0800
committer Commit bot <commit-bot@chromium.org> Wed Dec 03 06:24:10 2014 -0800
tree 96aa03d4b4b1802490cb5b769627b75f3de4a470
parent 960fb50a1a7ac76fd51e22983812f26bfffa6d1e

First step to moving vertex attributes to the geometryProcessor

BUG=skia:

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

src/gpu/gl/GrGLProgramDesc.cpp

diff --git a/src/gpu/gl/GrGLProgramDesc.cpp b/src/gpu/gl/GrGLProgramDesc.cpp
index 6a2d388..74f669f 100644
--- a/src/gpu/gl/GrGLProgramDesc.cpp
+++ b/src/gpu/gl/GrGLProgramDesc.cpp
@@ -63,9 +63,9 @@
 static uint32_t gen_attrib_key(const GrGeometryProcessor& proc) {
     uint32_t key = 0;
 
-    const GrGeometryProcessor::VertexAttribArray& vars = proc.getVertexAttribs();
+    const GrGeometryProcessor::VertexAttribArray& vars = proc.getAttribs();
     int numAttributes = vars.count();
-    SkASSERT(numAttributes <= 2);
+    SkASSERT(numAttributes <= GrGeometryProcessor::kMaxVertexAttribs);
     for (int a = 0; a < numAttributes; ++a) {
         uint32_t value = 1 << a;
         key |= value;
@@ -206,11 +206,7 @@
         header->fUseNvpr = false;
     }
 
-    bool hasUniformColor = inputColorIsUsed &&
-                           (isPathRendering || !descInfo.hasColorVertexAttribute());
-
-    bool hasUniformCoverage = inputCoverageIsUsed &&
-                              (isPathRendering || !descInfo.hasCoverageVertexAttribute());
+    bool hasUniformColor = inputColorIsUsed && (isPathRendering || !descInfo.fHasVertexColor);
 
     if (!inputColorIsUsed) {
         header->fColorInput = GrProgramDesc::kAllOnes_ColorInput;
@@ -221,12 +217,13 @@
         SkASSERT(!header->fUseNvpr);
     }
 
-    bool covIsSolidWhite = !descInfo.hasCoverageVertexAttribute() &&
-                           0xffffffff == optState.getCoverageColor();
+    bool hasVertexCoverage = !isPathRendering && descInfo.fHasVertexCoverage;
+
+    bool covIsSolidWhite = !hasVertexCoverage && 0xffffffff == optState.getCoverageColor();
 
     if (covIsSolidWhite || !inputCoverageIsUsed) {
         header->fCoverageInput = GrProgramDesc::kAllOnes_ColorInput;
-    } else if (hasUniformCoverage) {
+    } else if (!hasVertexCoverage) {
         header->fCoverageInput = GrProgramDesc::kUniform_ColorInput;
     } else {
         header->fCoverageInput = GrProgramDesc::kAttribute_ColorInput;
@@ -255,31 +252,6 @@
         header->fFragPosKey = 0;
     }
 
-    // Record attribute indices
-    header->fPositionAttributeIndex = descInfo.positionAttributeIndex();
-    header->fLocalCoordAttributeIndex = descInfo.localCoordAttributeIndex();
-
-    // For constant color and coverage we need an attribute with an index beyond those already set
-    int availableAttributeIndex = optState.getVertexAttribCount();
-    if (descInfo.hasColorVertexAttribute()) {
-        header->fColorAttributeIndex = descInfo.colorVertexAttributeIndex();
-    } else if (GrProgramDesc::kAttribute_ColorInput == header->fColorInput) {
-        SkASSERT(availableAttributeIndex < GrDrawState::kMaxVertexAttribCnt);
-        header->fColorAttributeIndex = availableAttributeIndex;
-        availableAttributeIndex++;
-    } else {
-        header->fColorAttributeIndex = -1;
-    }
-
-    if (descInfo.hasCoverageVertexAttribute()) {
-        header->fCoverageAttributeIndex = descInfo.coverageVertexAttributeIndex();
-    } else if (GrProgramDesc::kAttribute_ColorInput == header->fCoverageInput) {
-        SkASSERT(availableAttributeIndex < GrDrawState::kMaxVertexAttribCnt);
-        header->fCoverageAttributeIndex = availableAttributeIndex;
-    } else {
-        header->fCoverageAttributeIndex = -1;
-    }
-
     header->fPrimaryOutputType = descInfo.fPrimaryOutputType;
     header->fSecondaryOutputType = descInfo.fSecondaryOutputType;