First step to moving vertex attributes to the geometryProcessor

src/gpu/GrProgramDesc.h

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrProgramDesc_DEFINED
 #define GrProgramDesc_DEFINED
 
@@ skipping 93 matching lines @@
                                                    // Otherwise, 0.
 
         SkBool8                     fEmitsPointSize;
 
         ColorInput                  fColorInput : 8;
         ColorInput                  fCoverageInput : 8;
 
         PrimaryOutputType           fPrimaryOutputType : 8;
         SecondaryOutputType         fSecondaryOutputType : 8;
 
-        int8_t                      fPositionAttributeIndex;
-        int8_t                      fLocalCoordAttributeIndex;
-        int8_t                      fColorAttributeIndex;
-        int8_t                      fCoverageAttributeIndex;
-
         SkBool8                     fHasGeometryProcessor;
         int8_t                      fColorEffectCnt;
         int8_t                      fCoverageEffectCnt;
     };
 
 
     bool hasGeometryProcessor() const {
         return SkToBool(this->header().fHasGeometryProcessor);
     }
 
     int numColorEffects() const {
         return this->header().fColorEffectCnt;
     }
 
     int numCoverageEffects() const {
         return this->header().fCoverageEffectCnt;
     }
 
     int numTotalEffects() const { return this->numColorEffects() + this->numCoverageEffects(); }
 
     // This should really only be used internally, base classes should return their own headers
     const KeyHeader& header() const { return *this->atOffset<KeyHeader, kHeaderOffset>(); }
 
     // A struct to communicate descriptor information to the program descriptor builder
     struct DescInfo {
-        int positionAttributeIndex() const {
-            return fFixedFunctionVertexAttribIndices[kPosition_GrVertexAttribBinding];
-        }
-        int localCoordAttributeIndex() const {
-            return fFixedFunctionVertexAttribIndices[kLocalCoord_GrVertexAttribBinding];
-        }
-        int colorVertexAttributeIndex() const {
-            return fFixedFunctionVertexAttribIndices[kColor_GrVertexAttribBinding];
-        }
-        int coverageVertexAttributeIndex() const {
-            return fFixedFunctionVertexAttribIndices[kCoverage_GrVertexAttribBinding];
-        }
-        bool hasLocalCoordAttribute() const {
-            return -1 != fFixedFunctionVertexAttribIndices[kLocalCoord_GrVertexAttribBinding];
-        }
-        bool hasColorVertexAttribute() const {
-            return -1 != fFixedFunctionVertexAttribIndices[kColor_GrVertexAttribBinding];
-        }
-        bool hasCoverageVertexAttribute() const {
-            return -1 != fFixedFunctionVertexAttribIndices[kCoverage_GrVertexAttribBinding];
-        }
-
-        int fFixedFunctionVertexAttribIndices[kGrFixedFunctionVertexAttribBindingCnt];
+        // TODO when GPs control uniform / attribute handling of color / coverage, then we can
+        // clean this up
+        bool            fHasVertexColor;
+        bool            fHasVertexCoverage;
 
         // These flags are needed to protect the code from creating an unused uniform color/coverage
         // which will cause shader compiler errors.
         bool            fInputColorIsUsed;
         bool            fInputCoverageIsUsed;
 
         // These flags give aggregated info on the processor stages that are used when building
         // programs.
         bool            fReadsDst;
         bool            fReadsFragPosition;
@@ skipping 44 matching lines @@
         kPreAllocSize = kHeaderOffset + kHeaderSize +
                         kMaxPreallocProcessors * sizeof(uint32_t) * kIntsPerProcessor,
     };
 
     SkSTArray<kPreAllocSize, uint8_t, true> fKey;
 
     friend class GrGLProgramDescBuilder;
 };
 
 #endif