Revise attribute binding interface

src/gpu/GrAARectRenderer.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrAARectRenderer.h"
 #include "GrRefCnt.h"
 #include "GrGpu.h"
 
 SK_DEFINE_INST_COUNT(GrAARectRenderer)
 
 namespace {
 
-static void aa_rect_attributes(bool useCoverage, GrAttribBindings* bindings,
-                               GrDrawState::AttribIndex* index) {
-    if (useCoverage) {
-        *bindings = GrDrawState::kCoverage_AttribBindingsBit;
-        *index = GrDrawState::kCoverage_AttribIndex;
-    } else {
-        *bindings = GrDrawState::kColor_AttribBindingsBit;
-        *index = GrDrawState::kColor_AttribIndex;
-    }
+static void aa_rect_attributes(bool useCoverage, const GrVertexAttrib** attribs, int* count) {
+    static const GrVertexAttrib kCoverageAttribs[] = {
+        {kVec2f_GrVertexAttribType,  0, kPosition_GrVertexAttribBinding},
+        {kVec4ub_GrVertexAttribType, sizeof(GrPoint), kCoverage_GrVertexAttribBinding},
+    };
+    static const GrVertexAttrib kColorAttribs[] = {
+        {kVec2f_GrVertexAttribType,  0, kPosition_GrVertexAttribBinding},
+        {kVec4ub_GrVertexAttribType, sizeof(GrPoint), kColor_GrVertexAttribBinding},
+    };
+    *attribs = useCoverage ? kCoverageAttribs : kColorAttribs;
+    *count = 2;
 }
 
 static void set_inset_fan(GrPoint* pts, size_t stride,
                           const GrRect& r, SkScalar dx, SkScalar dy) {
     pts->setRectFan(r.fLeft + dx, r.fTop + dy,
                     r.fRight - dx, r.fBottom - dy, stride);
 }
 
 };
 
@@ skipping 86 matching lines @@
     }
     return fAAStrokeRectIndexBuffer;
 }
 
 void GrAARectRenderer::fillAARect(GrGpu* gpu,
                                   GrDrawTarget* target,
                                   const GrRect& devRect,
                                   bool useVertexCoverage) {
     GrDrawState* drawState = target->drawState();
 
-    // position + color/coverage
-    static const GrVertexAttrib kVertexAttribs[] = {
-        {kVec2f_GrVertexAttribType, 0},
-        {kVec4ub_GrVertexAttribType, sizeof(GrPoint)}
-    };
-    GrAttribBindings bindings;
-    GrDrawState::AttribIndex attribIndex;
-    aa_rect_attributes(useVertexCoverage, &bindings, &attribIndex);
-    drawState->setVertexAttribs(kVertexAttribs, SK_ARRAY_COUNT(kVertexAttribs));
-    drawState->setAttribBindings(bindings);
-    drawState->setAttribIndex(GrDrawState::kPosition_AttribIndex, 0);
-    drawState->setAttribIndex(attribIndex, 1);
+    const GrVertexAttrib* attribs;
+    int attribCount;
+    aa_rect_attributes(useVertexCoverage, &attribs, &attribCount);
+    drawState->setVertexAttribs(attribs, attribCount);
 
     GrDrawTarget::AutoReleaseGeometry geo(target, 8, 0);
     if (!geo.succeeded()) {
         GrPrintf("Failed to get space for vertices!\n");
         return;
     }
 
     GrIndexBuffer* indexBuffer = this->aaFillRectIndexBuffer(gpu);
     if (NULL == indexBuffer) {
         GrPrintf("Failed to create index buffer!\n");
@@ skipping 52 matching lines @@
         spare = GrMin(w, h);
     }
 
     if (spare <= 0) {
         GrRect r(devRect);
         r.inset(-rx, -ry);
         this->fillAARect(gpu, target, r, useVertexCoverage);
         return;
     }
 
-    // position + color/coverage
-    static const GrVertexAttrib kVertexAttribs[] = {
-        {kVec2f_GrVertexAttribType, 0},
-        {kVec4ub_GrVertexAttribType, sizeof(GrPoint)}
-    };
-    GrAttribBindings bindings;
-    GrDrawState::AttribIndex attribIndex;
-    aa_rect_attributes(useVertexCoverage, &bindings, &attribIndex);
-    drawState->setVertexAttribs(kVertexAttribs, SK_ARRAY_COUNT(kVertexAttribs));
-    drawState->setAttribBindings(bindings);
-    drawState->setAttribIndex(GrDrawState::kPosition_AttribIndex, 0);
-    drawState->setAttribIndex(attribIndex, 1);
+    const GrVertexAttrib* attribs;
+    int attribCount;
+    aa_rect_attributes(useVertexCoverage, &attribs, &attribCount);
+    drawState->setVertexAttribs(attribs, attribCount);
 
     GrDrawTarget::AutoReleaseGeometry geo(target, 16, 0);
     if (!geo.succeeded()) {
         GrPrintf("Failed to get space for vertices!\n");
         return;
     }
     GrIndexBuffer* indexBuffer = this->aaStrokeRectIndexBuffer(gpu);
     if (NULL == indexBuffer) {
         GrPrintf("Failed to create index buffer!\n");
         return;
@@ skipping 41 matching lines @@
     // The innermost rect has full coverage
     verts += 8 * vsize;
     for (int i = 0; i < 4; ++i) {
         *reinterpret_cast<GrColor*>(verts + i * vsize) = 0;
     }
 
     target->setIndexSourceToBuffer(indexBuffer);
     target->drawIndexed(kTriangles_GrPrimitiveType,
                         0, 0, 16, aaStrokeRectIndexCount());
 }