Removing vertex attrib indices

src/gpu/effects/GrGeometryProcessor.h

Index: src/gpu/effects/GrGeometryProcessor.h
diff --git a/src/gpu/effects/GrVertexEffect.h b/src/gpu/effects/GrGeometryProcessor.h
similarity index 67%
rename from src/gpu/effects/GrVertexEffect.h
rename to src/gpu/effects/GrGeometryProcessor.h
index 323c85e34e11501bc5260b0d0ad75b1ac38abb93..7e1f4cab6fe0a0aea38e0889891c11d1ee8a0a42 100644
--- a/src/gpu/effects/GrVertexEffect.h
+++ b/src/gpu/effects/GrGeometryProcessor.h
@@ -5,8 +5,8 @@
  * found in the LICENSE file.
  */
 
-#ifndef GrVertexEffect_DEFINED
-#define GrVertexEffect_DEFINED
+#ifndef GrGeometryProcessor_DEFINED
+#define GrGeometryProcessor_DEFINED
 
 #include "GrEffect.h"
 
@@ -15,9 +15,9 @@
  * Otherwise it won't be able to add vertex attribs, and it might be given a vertexless shader
  * program in emitCode.
  */
-class GrVertexEffect : public GrEffect {
+class GrGeometryProcessor : public GrEffect {
 public:
-    GrVertexEffect() { fRequiresVertexShader = true; }
+    GrGeometryProcessor() { fRequiresVertexShader = true; }
 
 protected:
     /**
@@ -25,9 +25,9 @@ protected:
      * kMaxVertexAttribs). This must only be called from the constructor because GrEffects are
      * immutable.
      */
-    void addVertexAttrib(GrSLType type) {
-        SkASSERT(fVertexAttribTypes.count() < kMaxVertexAttribs);
-        fVertexAttribTypes.push_back(type);
+    void addVertexAttrib(const GrShaderVar& var) {
+        SkASSERT(fVertexAttribs.count() < kMaxVertexAttribs);
+        fVertexAttribs.push_back(var);
     }
 
 private: