Introduce GrBatch subclasses GrDrawBatch and GrVertexBatch to prepare for non-drawing batches

src/gpu/GrBatchTest.cpp

Index: src/gpu/GrBatchTest.cpp
diff --git a/src/gpu/GrBatchTest.cpp b/src/gpu/GrBatchTest.cpp
index 181f0e684afce750c26581c8d5675477bac68083..1fc2ce85d983bc0d145301f91d9ba5f67a8891ee 100644
--- a/src/gpu/GrBatchTest.cpp
+++ b/src/gpu/GrBatchTest.cpp
@@ -11,45 +11,45 @@
 
 #ifdef GR_TEST_UTILS
 
-BATCH_TEST_EXTERN(AAConvexPathBatch);
-BATCH_TEST_EXTERN(AADistanceFieldPathBatch);
-BATCH_TEST_EXTERN(AAFillRectBatch);
-BATCH_TEST_EXTERN(AAFillRectBatchLocalMatrix);
-BATCH_TEST_EXTERN(AAHairlineBatch);
-BATCH_TEST_EXTERN(AAStrokeRectBatch);
-BATCH_TEST_EXTERN(DashBatch);
-BATCH_TEST_EXTERN(DefaultPathBatch);
-BATCH_TEST_EXTERN(CircleBatch);
-BATCH_TEST_EXTERN(DIEllipseBatch);
-BATCH_TEST_EXTERN(EllipseBatch);
-BATCH_TEST_EXTERN(GrDrawAtlasBatch);
-BATCH_TEST_EXTERN(GrStrokeRectBatch);
-BATCH_TEST_EXTERN(RRectBatch);
-BATCH_TEST_EXTERN(TesselatingPathBatch);
-BATCH_TEST_EXTERN(TextBlobBatch);
-BATCH_TEST_EXTERN(VerticesBatch);
+DRAW_BATCH_TEST_EXTERN(AAConvexPathBatch);
+DRAW_BATCH_TEST_EXTERN(AADistanceFieldPathBatch);
+DRAW_BATCH_TEST_EXTERN(AAFillRectBatch);
+DRAW_BATCH_TEST_EXTERN(AAFillRectBatchLocalMatrix);
+DRAW_BATCH_TEST_EXTERN(AAHairlineBatch);
+DRAW_BATCH_TEST_EXTERN(AAStrokeRectBatch);
+DRAW_BATCH_TEST_EXTERN(DashBatch);
+DRAW_BATCH_TEST_EXTERN(DefaultPathBatch);
+DRAW_BATCH_TEST_EXTERN(CircleBatch);
+DRAW_BATCH_TEST_EXTERN(DIEllipseBatch);
+DRAW_BATCH_TEST_EXTERN(EllipseBatch);
+DRAW_BATCH_TEST_EXTERN(GrDrawAtlasBatch);
+DRAW_BATCH_TEST_EXTERN(GrStrokeRectBatch);
+DRAW_BATCH_TEST_EXTERN(RRectBatch);
+DRAW_BATCH_TEST_EXTERN(TesselatingPathBatch);
+DRAW_BATCH_TEST_EXTERN(TextBlobBatch);
+DRAW_BATCH_TEST_EXTERN(VerticesBatch);
 
 static BatchTestFunc gTestBatches[] = {
-    BATCH_TEST_ENTRY(AAConvexPathBatch),
-    BATCH_TEST_ENTRY(AADistanceFieldPathBatch),
-    BATCH_TEST_ENTRY(AAFillRectBatch),
-    BATCH_TEST_ENTRY(AAFillRectBatchLocalMatrix),
-    BATCH_TEST_ENTRY(AAHairlineBatch),
-    BATCH_TEST_ENTRY(AAStrokeRectBatch),
-    BATCH_TEST_ENTRY(DashBatch),
-    BATCH_TEST_ENTRY(DefaultPathBatch),
-    BATCH_TEST_ENTRY(CircleBatch),
-    BATCH_TEST_ENTRY(DIEllipseBatch),
-    BATCH_TEST_ENTRY(EllipseBatch),
-    BATCH_TEST_ENTRY(GrDrawAtlasBatch),
-    BATCH_TEST_ENTRY(GrStrokeRectBatch),
-    BATCH_TEST_ENTRY(RRectBatch),
-    BATCH_TEST_ENTRY(TesselatingPathBatch),
-    BATCH_TEST_ENTRY(TextBlobBatch),
-    BATCH_TEST_ENTRY(VerticesBatch)
+    DRAW_BATCH_TEST_ENTRY(AAConvexPathBatch),
+    DRAW_BATCH_TEST_ENTRY(AADistanceFieldPathBatch),
+    DRAW_BATCH_TEST_ENTRY(AAFillRectBatch),
+    DRAW_BATCH_TEST_ENTRY(AAFillRectBatchLocalMatrix),
+    DRAW_BATCH_TEST_ENTRY(AAHairlineBatch),
+    DRAW_BATCH_TEST_ENTRY(AAStrokeRectBatch),
+    DRAW_BATCH_TEST_ENTRY(DashBatch),
+    DRAW_BATCH_TEST_ENTRY(DefaultPathBatch),
+    DRAW_BATCH_TEST_ENTRY(CircleBatch),
+    DRAW_BATCH_TEST_ENTRY(DIEllipseBatch),
+    DRAW_BATCH_TEST_ENTRY(EllipseBatch),
+    DRAW_BATCH_TEST_ENTRY(GrDrawAtlasBatch),
+    DRAW_BATCH_TEST_ENTRY(GrStrokeRectBatch),
+    DRAW_BATCH_TEST_ENTRY(RRectBatch),
+    DRAW_BATCH_TEST_ENTRY(TesselatingPathBatch),
+    DRAW_BATCH_TEST_ENTRY(TextBlobBatch),
+    DRAW_BATCH_TEST_ENTRY(VerticesBatch)
 };
 
-GrBatch* GrRandomBatch(SkRandom* random, GrContext* context) {
+GrDrawBatch* GrRandomDrawBatch(SkRandom* random, GrContext* context) {
     uint32_t index = random->nextULessThan(static_cast<uint32_t>(SK_ARRAY_COUNT(gTestBatches)));
     BatchTestFunc func = gTestBatches[index];
     return (*func)(random, context);