Removing vertex attrib indices

include/gpu/GrPaint.h

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef GrPaint_DEFINED
@@ skipping 69 matching lines @@
 
     /**
      * Should dithering be applied. Defaults to false.
      */
     void setDither(bool dither) { fDither = dither; }
     bool isDither() const { return fDither; }
 
     /**
      * Appends an additional color effect to the color computation.
      */
-    const GrEffect* addColorEffect(const GrEffect* effect, int attr0 = -1, int attr1 = -1) {
+    const GrEffect* addColorEffect(const GrEffect* effect) {
         SkASSERT(effect);
+        SkASSERT(!effect->requiresVertexShader());
         if (!effect->willUseInputColor()) {
             fColorStages.reset();
         }
-        SkNEW_APPEND_TO_TARRAY(&fColorStages, GrEffectStage, (effect, attr0, attr1));
+        SkNEW_APPEND_TO_TARRAY(&fColorStages, GrEffectStage, (effect));
         return effect;
     }
 
     /**
      * Appends an additional coverage effect to the coverage computation.
      */
-    const GrEffect* addCoverageEffect(const GrEffect* effect, int attr0 = -1, int attr1 = -1) {
+    const GrEffect* addCoverageEffect(const GrEffect* effect) {
         SkASSERT(effect);
+        SkASSERT(!effect->requiresVertexShader());
         if (!effect->willUseInputColor()) {
             fCoverageStages.reset();
         }
-        SkNEW_APPEND_TO_TARRAY(&fCoverageStages, GrEffectStage, (effect, attr0, attr1));
+        SkNEW_APPEND_TO_TARRAY(&fCoverageStages, GrEffectStage, (effect));
         return effect;
     }
 
     /**
      * Helpers for adding color or coverage effects that sample a texture. The matrix is applied
      * to the src space position to compute texture coordinates.
      */
     void addColorTextureEffect(GrTexture* texture, const SkMatrix& matrix);
     void addCoverageTextureEffect(GrTexture* texture, const SkMatrix& matrix);
 
@@ skipping 127 matching lines @@
         fCoverage = 0xff;
     }
 
     void resetStages() {
         fColorStages.reset();
         fCoverageStages.reset();
     }
 };
 
 #endif