First step to moving vertex attributes to the geometryProcessor

src/gpu/gl/GrGLProgramDesc.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "GrGLProgramDesc.h"
 
 #include "GrGLProcessor.h"
 #include "GrBackendProcessorFactory.h"
@@ skipping 45 matching lines @@
             // alpha-only textures smear alpha across all four channels when read.
             return true;
         }
     }
     return false;
 }
 
 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;
     }
     return key;
 }
 
 static uint32_t gen_transform_key(const GrPendingFragmentStage& stage,
                                   bool useExplicitLocalCoords) {
     uint32_t totalKey = 0;
@@ skipping 120 matching lines @@
     header->fEmitsPointSize = GrGpu::kDrawPoints_DrawType == drawType;
 
     bool isPathRendering = GrGpu::IsPathRenderingDrawType(drawType);
     if (gpu->caps()->pathRenderingSupport() && isPathRendering) {
         header->fUseNvpr = true;
         SkASSERT(!optState.hasGeometryProcessor());
     } else {
         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;
     } else if (hasUniformColor) {
         header->fColorInput = GrProgramDesc::kUniform_ColorInput;
     } else {
         header->fColorInput = GrProgramDesc::kAttribute_ColorInput;
         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;
         SkASSERT(!header->fUseNvpr);
     }
 
     if (descInfo.fReadsDst) {
         const GrDeviceCoordTexture* dstCopy = optState.getDstCopy();
         SkASSERT(dstCopy || gpu->caps()->dstReadInShaderSupport());
         const GrTexture* dstCopyTexture = NULL;
         if (dstCopy) {
             dstCopyTexture = dstCopy->texture();
         }
         header->fDstReadKey = GrGLFragmentShaderBuilder::KeyForDstRead(dstCopyTexture,
                                                                        gpu->glCaps());
         SkASSERT(0 != header->fDstReadKey);
     } else {
         header->fDstReadKey = 0;
     }
 
     if (descInfo.fReadsFragPosition) {
         header->fFragPosKey =
                 GrGLFragmentShaderBuilder::KeyForFragmentPosition(optState.getRenderTarget(),
                                                                   gpu->glCaps());
     } else {
         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;
 
     header->fColorEffectCnt = optState.numColorStages();
     header->fCoverageEffectCnt = optState.numCoverageStages();
     desc->finalize();
     return true;
 }