Revert of Start on simplifying generateGeometry() overrides

src/gpu/GrContext.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 "GrContext.h"
 
@@ skipping 484 matching lines @@
             // hairline
             primType = kLineStrip_GrPrimitiveType;
             vertex[0].set(args.fRect.fLeft, args.fRect.fTop);
             vertex[1].set(args.fRect.fRight, args.fRect.fTop);
             vertex[2].set(args.fRect.fRight, args.fRect.fBottom);
             vertex[3].set(args.fRect.fLeft, args.fRect.fBottom);
             vertex[4].set(args.fRect.fLeft, args.fRect.fTop);
         }
 
         GrDrawTarget::DrawInfo drawInfo;
-        drawInfo.init(primType, vertexBuffer, firstVertex, vertexCount);
+        drawInfo.setPrimitiveType(primType);
+        drawInfo.setVertexBuffer(vertexBuffer);
+        drawInfo.setStartVertex(firstVertex);
+        drawInfo.setVertexCount(vertexCount);
+        drawInfo.setStartIndex(0);
+        drawInfo.setIndexCount(0);
+        drawInfo.setInstanceCount(0);
+        drawInfo.setVerticesPerInstance(0);
+        drawInfo.setIndicesPerInstance(0);
         batchTarget->draw(drawInfo);
     }
 
     SkSTArray<1, Geometry, true>* geoData() { return &fGeoData; }
 
 private:
     StrokeRectBatch(const Geometry& geometry) {
         this->initClassID<StrokeRectBatch>();
 
         fBatch.fHairline = geometry.fStrokeWidth == 0;
@@ skipping 298 matching lines @@
         void* vertices = batchTarget->vertexPool()->makeSpace(vertexStride,
                                                               this->vertexCount(),
                                                               &vertexBuffer,
                                                               &firstVertex);
 
         if (!vertices) {
             SkDebugf("Could not allocate vertices\n");
             return;
         }
 
-        const GrIndexBuffer* indexBuffer = NULL;
-        int firstIndex = 0;
+        const GrIndexBuffer* indexBuffer;
+        int firstIndex;
 
         void* indices = NULL;
         if (this->hasIndices()) {
             indices = batchTarget->indexPool()->makeSpace(this->indexCount(),
                                                           &indexBuffer,
                                                           &firstIndex);
 
             if (!indices) {
                 SkDebugf("Could not allocate indices\n");
                 return;
@@ skipping 19 matching lines @@
                 }
                 if (this->hasLocalCoords()) {
                     *(SkPoint*)((intptr_t)vertices + texOffset) = args.fLocalCoords[j];
                 }
                 vertices = (void*)((intptr_t)vertices + vertexStride);
                 vertexOffset++;
             }
         }
 
         GrDrawTarget::DrawInfo drawInfo;
+        drawInfo.setPrimitiveType(this->primitiveType());
+        drawInfo.setVertexBuffer(vertexBuffer);
+        drawInfo.setStartVertex(firstVertex);
+        drawInfo.setVertexCount(this->vertexCount());
         if (this->hasIndices()) {
-            drawInfo.initIndexed(this->primitiveType(), vertexBuffer, indexBuffer, firstVertex,
-                                 firstIndex, this->vertexCount(), this->indexCount());
-
+            drawInfo.setIndexBuffer(indexBuffer);
+            drawInfo.setStartIndex(firstIndex);
+            drawInfo.setIndexCount(this->indexCount());
         } else {
-            drawInfo.init(this->primitiveType(), vertexBuffer, firstVertex, this->vertexCount());
+            drawInfo.setStartIndex(0);
+            drawInfo.setIndexCount(0);
         }
         batchTarget->draw(drawInfo);
     }
 
     SkSTArray<1, Geometry, true>* geoData() { return &fGeoData; }
 
 private:
     DrawVerticesBatch(const Geometry& geometry, GrPrimitiveType primitiveType,
                       const SkMatrix& viewMatrix,
                       const SkPoint* positions, int vertexCount,
@@ skipping 1005 matching lines @@
         fDrawBuffer->addGpuTraceMarker(marker);
     }
 }
 
 void GrContext::removeGpuTraceMarker(const GrGpuTraceMarker* marker) {
     fGpu->removeGpuTraceMarker(marker);
     if (fDrawBuffer) {
         fDrawBuffer->removeGpuTraceMarker(marker);
     }
 }