Start on simplifying generateGeometry() overrides

src/gpu/GrAAHairLinePathRenderer.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrAAHairLinePathRenderer.h"
 
 #include "GrBatch.h"
@@ skipping 870 matching lines @@
         }
 
         SkASSERT(lineGP->getVertexStride() == sizeof(LineVertex));
 
         LineVertex* verts = reinterpret_cast<LineVertex*>(vertices);
         for (int i = 0; i < lineCount; ++i) {
             add_line(&lines[2*i], toSrc, this->coverage(), &verts);
         }
 
         {
+            int linesLeft = lineCount;
             GrDrawTarget::DrawInfo info;
-            info.setVertexBuffer(vertexBuffer);
-            info.setIndexBuffer(linesIndexBuffer);
-            info.setPrimitiveType(kTriangles_GrPrimitiveType);
-            info.setStartIndex(0);
-
-            int lines = 0;
-            while (lines < lineCount) {
-                int n = SkTMin(lineCount - lines, kLineSegsNumInIdxBuffer);
-
-                info.setStartVertex(kLineSegNumVertices*lines + firstVertex);
-                info.setVertexCount(kLineSegNumVertices*n);
-                info.setIndexCount(kIdxsPerLineSeg*n);
+            info.initInstanced(kTriangles_GrPrimitiveType, vertexBuffer, linesIndexBuffer,
+                               firstVertex, kLineSegNumVertices, kIdxsPerLineSeg, &linesLeft,
+                               kLineSegsNumInIdxBuffer);
+            do {
                 batchTarget->draw(info);
-
-                lines += n;
-            }
+            } while (info.nextInstances(&linesLeft, kLineSegsNumInIdxBuffer));
         }
     }
 
     if (quadCount || conicCount) {
         const GrVertexBuffer* vertexBuffer;
         int firstVertex;
 
         SkAutoTUnref<const GrIndexBuffer> quadsIndexBuffer(
             ref_quads_index_buffer(batchTarget->resourceProvider()));
 
@@ skipping 28 matching lines @@
 
             // TODO remove this when batch is everywhere
             GrPipelineInfo init;
             init.fColorIgnored = fBatch.fColorIgnored;
             init.fOverrideColor = GrColor_ILLEGAL;
             init.fCoverageIgnored = fBatch.fCoverageIgnored;
             init.fUsesLocalCoords = this->usesLocalCoords();
             quadGP->initBatchTracker(batchTarget->currentBatchTracker(), init);
 
             {
-               GrDrawTarget::DrawInfo info;
-               info.setVertexBuffer(vertexBuffer);
-               info.setIndexBuffer(quadsIndexBuffer);
-               info.setPrimitiveType(kTriangles_GrPrimitiveType);
-               info.setStartIndex(0);
-
-               int quads = 0;
-               while (quads < quadCount) {
-                   int n = SkTMin(quadCount - quads, kQuadsNumInIdxBuffer);
-
-                   info.setStartVertex(kQuadNumVertices*quads + firstVertex);
-                   info.setVertexCount(kQuadNumVertices*n);
-                   info.setIndexCount(kIdxsPerQuad*n);
+                int quadsLeft = quadCount;
+                GrDrawTarget::DrawInfo info;
+                info.initInstanced(kTriangles_GrPrimitiveType, vertexBuffer, quadsIndexBuffer,
+                                   firstVertex, kQuadNumVertices, kIdxsPerQuad, &quadsLeft,
+                                   kQuadsNumInIdxBuffer);
+               do {
                    batchTarget->draw(info);
-
-                   quads += n;
-               }
+               } while (info.nextInstances(&quadsLeft, kQuadsNumInIdxBuffer));
+               firstVertex += quadCount * kQuadNumVertices;
            }
         }
 
         if (conicCount > 0) {
             batchTarget->initDraw(conicGP, pipeline);
 
             // TODO remove this when batch is everywhere
             GrPipelineInfo init;
             init.fColorIgnored = fBatch.fColorIgnored;
             init.fOverrideColor = GrColor_ILLEGAL;
             init.fCoverageIgnored = fBatch.fCoverageIgnored;
             init.fUsesLocalCoords = this->usesLocalCoords();
             conicGP->initBatchTracker(batchTarget->currentBatchTracker(), init);
 
             {
+                int conicsLeft = conicCount;
                 GrDrawTarget::DrawInfo info;
-                info.setVertexBuffer(vertexBuffer);
-                info.setIndexBuffer(quadsIndexBuffer);
-                info.setPrimitiveType(kTriangles_GrPrimitiveType);
-                info.setStartIndex(0);
-
-                int conics = 0;
-                while (conics < conicCount) {
-                    int n = SkTMin(conicCount - conics, kQuadsNumInIdxBuffer);
-
-                    info.setStartVertex(kQuadNumVertices*(quadCount + conics) + firstVertex);
-                    info.setVertexCount(kQuadNumVertices*n);
-                    info.setIndexCount(kIdxsPerQuad*n);
+                info.initInstanced(kTriangles_GrPrimitiveType, vertexBuffer, quadsIndexBuffer,
+                                  firstVertex, kQuadNumVertices, kIdxsPerQuad, &conicsLeft,
+                                  kQuadsNumInIdxBuffer);
+                do {
                     batchTarget->draw(info);
-
-                    conics += n;
-                }
+                } while (info.nextInstances(&conicsLeft, kQuadsNumInIdxBuffer));
             }
         }
     }
 }
 
 static GrBatch* create_hairline_batch(GrColor color,
                                       const SkMatrix& viewMatrix,
                                       const SkPath& path,
                                       const GrStrokeInfo& stroke,
                                       const SkIRect& devClipBounds) {
@@ skipping 39 matching lines @@
     GrColor color = GrRandomColor(random);
     SkMatrix viewMatrix = GrTest::TestMatrix(random);
     GrStrokeInfo stroke(SkStrokeRec::kHairline_InitStyle);
     SkPath path = GrTest::TestPath(random);
     SkIRect devClipBounds;
     devClipBounds.setEmpty();
     return create_hairline_batch(color, viewMatrix, path, stroke, devClipBounds);
 }
 
 #endif