Removing vertex attrib indices

include/gpu/GrEffectStage.h

 
 /*
  * Copyright 2010 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 
 #ifndef GrEffectStage_DEFINED
 #define GrEffectStage_DEFINED
 
 #include "GrBackendEffectFactory.h"
 #include "GrEffect.h"
 #include "GrProgramElementRef.h"
 #include "SkMatrix.h"
 #include "SkShader.h"
 
 // TODO: Make two variations on this class: One for GrDrawState that only owns regular refs
 // and supports compatibility checks and changing local coords. The second is for GrOptDrawState,
 // is immutable, and only owns pending execution refs. This requries removing the common base
 // class from GrDrawState and GrOptDrawState called GrRODrawState and converting to GrOptDrawState
 // when draws are enqueued in the GrInOrderDrawBuffer.
 class GrEffectStage {
 public:
-    explicit GrEffectStage(const GrEffect* effect, int attrIndex0 = -1, int attrIndex1 = -1)
+    explicit GrEffectStage(const GrEffect* effect)
     : fEffect(SkRef(effect)) {
         fCoordChangeMatrixSet = false;
-        fVertexAttribIndices[0] = attrIndex0;
-        fVertexAttribIndices[1] = attrIndex1;
     }
 
     GrEffectStage(const GrEffectStage& other) {
         fCoordChangeMatrixSet = other.fCoordChangeMatrixSet;
         if (other.fCoordChangeMatrixSet) {
             fCoordChangeMatrix = other.fCoordChangeMatrix;
         }
         fEffect.initAndRef(other.fEffect);
-        memcpy(fVertexAttribIndices, other.fVertexAttribIndices, sizeof(fVertexAttribIndices));
     }
     
     static bool AreCompatible(const GrEffectStage& a, const GrEffectStage& b,
                               bool usingExplicitLocalCoords) {
         SkASSERT(a.fEffect.get());
         SkASSERT(b.fEffect.get());
 
         if (!a.getEffect()->isEqual(*b.getEffect())) {
             return false;
         }
@@ skipping 75 matching lines @@
     const SkMatrix& getCoordChangeMatrix() const {
         if (fCoordChangeMatrixSet) {
             return fCoordChangeMatrix;
         } else {
             return SkMatrix::I();
         }
     }
 
     const GrEffect* getEffect() const { return fEffect.get(); }
 
-    const int* getVertexAttribIndices() const { return fVertexAttribIndices; }
-    int getVertexAttribIndexCount() const { return fEffect->numVertexAttribs(); }
-
     void convertToPendingExec() { fEffect.convertToPendingExec(); }
 
 private:
     bool                                fCoordChangeMatrixSet;
     SkMatrix                            fCoordChangeMatrix;
     GrProgramElementRef<const GrEffect> fEffect;
-    int                                 fVertexAttribIndices[2];
 };
 
 #endif