Revise attribute binding interface

src/gpu/gl/GrGLProgramDesc.h

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrGLProgramDesc_DEFINED
 #define GrGLProgramDesc_DEFINED
 
@@ skipping 18 matching lines @@
     }
 
     // Returns this as a uint32_t array to be used as a key in the program cache
     const uint32_t* asKey() const {
         return reinterpret_cast<const uint32_t*>(this);
     }
 
     // For unit testing.
     void setRandom(SkMWCRandom*,
                    const GrGpuGL* gpu,
-                   const GrEffectStage stages[GrDrawState::kNumStages]);
+                   const GrEffectStage stages[GrDrawState::kNumStages],
+                   int currAttribIndex);
 
     /**
      * Builds a program descriptor from a GrDrawState. Whether the primitive type is points, the
      * output of GrDrawState::getBlendOpts, and the caps of the GrGpuGL are also inputs.
      */
     static void Build(const GrDrawState&,
                       bool isPoints,
                       GrDrawState::BlendOptFlags,
                       GrBlendCoeff srcCoeff,
                       GrBlendCoeff dstCoeff,
@@ skipping 15 matching lines @@
     // secondary source is output and what value it holds.
     enum DualSrcOutput {
         kNone_DualSrcOutput,
         kCoverage_DualSrcOutput,
         kCoverageISA_DualSrcOutput,
         kCoverageISC_DualSrcOutput,
 
         kDualSrcOutputCnt
     };
 
-    // should the FS discard if the coverage is zero (to avoid stencil manipulation)
-    bool                        fDiscardIfZeroCoverage;
-
-    // stripped of bits that don't affect program generation
-    GrAttribBindings            fAttribBindings;
-
     /** Non-zero if this stage has an effect */
     GrGLEffect::EffectKey       fEffectKeys[GrDrawState::kNumStages];
 
+    // should the FS discard if the coverage is zero (to avoid stencil manipulation)
+    SkBool8                     fDiscardIfZeroCoverage;
+
+    uint8_t                     fColorInput;            // casts to enum ColorInput
+    uint8_t                     fCoverageInput;         // casts to enum ColorInput
+    uint8_t                     fDualSrcOutput;         // casts to enum DualSrcOutput
+
+    int8_t                      fFirstCoverageStage;
+    SkBool8                     fEmitsPointSize;
+    uint8_t                     fColorFilterXfermode;   // casts to enum SkXfermode::Mode
+
+    int8_t                      fPositionAttributeIndex;
+    int8_t                      fLocalCoordAttributeIndex;
+    int8_t                      fColorAttributeIndex;
+    int8_t                      fCoverageAttributeIndex;
+
     // To enable experimental geometry shader code (not for use in
     // production)
 #if GR_GL_EXPERIMENTAL_GS
     bool                        fExperimentalGS;
 #endif
-    uint8_t                     fColorInput;            // casts to enum ColorInput
-    uint8_t                     fCoverageInput;         // casts to enum ColorInput
-    uint8_t                     fDualSrcOutput;         // casts to enum DualSrcOutput
-    int8_t                      fFirstCoverageStage;
-    SkBool8                     fEmitsPointSize;
-    uint8_t                     fColorFilterXfermode;   // casts to enum SkXfermode::Mode
-
-    int8_t                      fPositionAttributeIndex;
-    int8_t                      fColorAttributeIndex;
-    int8_t                      fCoverageAttributeIndex;
-    int8_t                      fLocalCoordsAttributeIndex;
 
     // GrGLProgram reads the private fields to generate code.
     friend class GrGLProgram;
 };
 
 #endif