Simplify adding attributes to GrGeometryProcessor

src/gpu/batches/GrPLSPathRenderer.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrPLSPathRenderer.h"
 
 #include "SkChunkAlloc.h"
@@ skipping 403 matching lines @@
 
     virtual GrGLSLPrimitiveProcessor* createGLSLInstance(const GrGLSLCaps&) const override {
         return new GLSLProcessor(*this);
     }
 
 private:
     PLSAATriangleEffect(const SkMatrix& localMatrix, bool usesLocalCoords)
         : fLocalMatrix(localMatrix)
         , fUsesLocalCoords(usesLocalCoords) {
         this->initClassID<PLSAATriangleEffect>();
-        fInPosition = &this->addVertexAttrib(Attribute("inPosition", kVec2f_GrVertexAttribType,
-                                                       kHigh_GrSLPrecision));
-        fInVertex1 = &this->addVertexAttrib(Attribute("inVertex1", kVec2f_GrVertexAttribType,
-                                                      kHigh_GrSLPrecision));
-        fInVertex2 = &this->addVertexAttrib(Attribute("inVertex2", kVec2f_GrVertexAttribType,
-                                                      kHigh_GrSLPrecision));
-        fInVertex3 = &this->addVertexAttrib(Attribute("inVertex3", kVec2f_GrVertexAttribType,
-                                                      kHigh_GrSLPrecision));
-        fInWindings = &this->addVertexAttrib(Attribute("inWindings", kInt_GrVertexAttribType,
-                                                       kLow_GrSLPrecision));
+        fInPosition = &this->addVertexAttrib("inPosition", kVec2f_GrVertexAttribType,
+                                             kHigh_GrSLPrecision);
+        fInVertex1 = &this->addVertexAttrib("inVertex1", kVec2f_GrVertexAttribType,
+                                            kHigh_GrSLPrecision);
+        fInVertex2 = &this->addVertexAttrib("inVertex2", kVec2f_GrVertexAttribType,
+                                            kHigh_GrSLPrecision);
+        fInVertex3 = &this->addVertexAttrib("inVertex3", kVec2f_GrVertexAttribType,
+                                            kHigh_GrSLPrecision);
+        fInWindings = &this->addVertexAttrib("inWindings", kInt_GrVertexAttribType,
+                                             kLow_GrSLPrecision);
         this->setWillReadFragmentPosition();
     }
 
     const Attribute* fInPosition;
     const Attribute* fInVertex1;
     const Attribute* fInVertex2;
     const Attribute* fInVertex3;
     const Attribute* fInWindings;
     SkMatrix         fLocalMatrix;
     bool             fUsesLocalCoords;
@@ skipping 160 matching lines @@
 
     virtual GrGLSLPrimitiveProcessor* createGLSLInstance(const GrGLSLCaps&) const override {
         return new GLSLProcessor(*this);
     }
 
 private:
     PLSQuadEdgeEffect(const SkMatrix& localMatrix, bool usesLocalCoords)
         : fLocalMatrix(localMatrix)
         , fUsesLocalCoords(usesLocalCoords) {
         this->initClassID<PLSQuadEdgeEffect>();
-        fInPosition = &this->addVertexAttrib(Attribute("inPosition", kVec2f_GrVertexAttribType,
-                                                       kHigh_GrSLPrecision));
-        fInUV = &this->addVertexAttrib(Attribute("inUV", kVec2f_GrVertexAttribType,
-                                                 kHigh_GrSLPrecision));
-        fInEndpoint1 = &this->addVertexAttrib(Attribute("inEndpoint1", kVec2f_GrVertexAttribType,
-                                                        kHigh_GrSLPrecision));
-        fInEndpoint2 = &this->addVertexAttrib(Attribute("inEndpoint2", kVec2f_GrVertexAttribType,
-                                                        kHigh_GrSLPrecision));
-        fInWindings  = &this->addVertexAttrib(Attribute("inWindings", kInt_GrVertexAttribType,
-                                                        kLow_GrSLPrecision));
+        fInPosition = &this->addVertexAttrib("inPosition", kVec2f_GrVertexAttribType,
+                                             kHigh_GrSLPrecision);
+        fInUV = &this->addVertexAttrib("inUV", kVec2f_GrVertexAttribType, kHigh_GrSLPrecision);
+        fInEndpoint1 = &this->addVertexAttrib("inEndpoint1", kVec2f_GrVertexAttribType,
+                                              kHigh_GrSLPrecision);
+        fInEndpoint2 = &this->addVertexAttrib("inEndpoint2", kVec2f_GrVertexAttribType,
+                                              kHigh_GrSLPrecision);
+        fInWindings  = &this->addVertexAttrib("inWindings", kInt_GrVertexAttribType,
+                                              kLow_GrSLPrecision);
         this->setWillReadFragmentPosition();
     }
 
     const Attribute* fInPosition;
     const Attribute* fInUV;
     const Attribute* fInEndpoint1;
     const Attribute* fInEndpoint2;
     const Attribute* fInWindings;
     SkMatrix         fLocalMatrix;
     bool             fUsesLocalCoords;
@@ skipping 121 matching lines @@
     }
 
 private:
     PLSFinishEffect(GrColor color, bool useEvenOdd, const SkMatrix& localMatrix,
                     bool usesLocalCoords)
         : fColor(color)
         , fUseEvenOdd(useEvenOdd)
         , fLocalMatrix(localMatrix)
         , fUsesLocalCoords(usesLocalCoords) {
         this->initClassID<PLSFinishEffect>();
-        fInPosition = &this->addVertexAttrib(Attribute("inPosition", kVec2f_GrVertexAttribType,
-                                                       kHigh_GrSLPrecision));
+        fInPosition = &this->addVertexAttrib("inPosition", kVec2f_GrVertexAttribType,
+                                             kHigh_GrSLPrecision);
     }
 
     const Attribute* fInPosition;
     GrColor          fColor;
     bool             fUseEvenOdd;
     SkMatrix         fLocalMatrix;
     bool             fUsesLocalCoords;
 
     typedef GrGeometryProcessor INHERITED;
 };
@@ skipping 193 matching lines @@
 
 DRAW_BATCH_TEST_DEFINE(PLSPathBatch) {
     GrColor color = GrRandomColor(random);
     SkMatrix vm = GrTest::TestMatrixInvertible(random);
     SkPath path = GrTest::TestPathConvex(random);
 
     return new PLSPathBatch(color, path, vm);
 }
 
 #endif