commit abd30f54b7ff1704a8930c4307ea242d09425d02
author bsalomon <bsalomon@google.com> Thu Aug 13 13:34:48 2015 -0700
committer Commit bot <commit-bot@chromium.org> Thu Aug 13 13:34:48 2015 -0700
tree 08eb5fdaa2fbe55f2e763a1d3c05054896919b68
parent 8f34372f7e97482e5e61ab298b7edaa008ba2f4c

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

Review URL: https://codereview.chromium.org/1293583002

gm/beziereffects.cpp

diff --git a/gm/beziereffects.cpp b/gm/beziereffects.cpp
index 17b67ee..a53ac0e 100644
--- a/gm/beziereffects.cpp
+++ b/gm/beziereffects.cpp
@@ -38,8 +38,8 @@
 
     const char* name() const override { return "BezierCubicOrConicTestBatch"; }
 
-    static GrBatch* Create(const GrGeometryProcessor* gp, const Geometry& geo,
-                           const SkScalar klmEqs[9], SkScalar sign) {
+    static GrDrawBatch* Create(const GrGeometryProcessor* gp, const Geometry& geo,
+                               const SkScalar klmEqs[9], SkScalar sign) {
         return SkNEW_ARGS(BezierCubicOrConicTestBatch, (gp, geo, klmEqs, sign));
     }
 
@@ -228,7 +228,7 @@
                     geometry.fColor = color;
                     geometry.fBounds = bounds;
 
-                    SkAutoTUnref<GrBatch> batch(
+                    SkAutoTUnref<GrDrawBatch> batch(
                             BezierCubicOrConicTestBatch::Create(gp, geometry, klmEqs, klmSigns[c]));
 
                     tt.target()->drawBatch(pipelineBuilder, batch);
@@ -373,7 +373,7 @@
                     geometry.fColor = color;
                     geometry.fBounds = bounds;
 
-                    SkAutoTUnref<GrBatch> batch(
+                    SkAutoTUnref<GrDrawBatch> batch(
                             BezierCubicOrConicTestBatch::Create(gp, geometry, klmEqs, 1.f));
 
                     tt.target()->drawBatch(pipelineBuilder, batch);
@@ -438,8 +438,8 @@
 
     const char* name() const override { return "BezierQuadTestBatch"; }
 
-    static GrBatch* Create(const GrGeometryProcessor* gp, const Geometry& geo,
-                           const GrPathUtils::QuadUVMatrix& devToUV) {
+    static GrDrawBatch* Create(const GrGeometryProcessor* gp, const Geometry& geo,
+                               const GrPathUtils::QuadUVMatrix& devToUV) {
         return SkNEW_ARGS(BezierQuadTestBatch, (gp, geo, devToUV));
     }
 
@@ -613,7 +613,8 @@
                     geometry.fColor = color;
                     geometry.fBounds = bounds;
 
-                    SkAutoTUnref<GrBatch> batch(BezierQuadTestBatch::Create(gp, geometry, DevToUV));
+                    SkAutoTUnref<GrDrawBatch> batch(BezierQuadTestBatch::Create(gp, geometry,
+                                                                                DevToUV));
 
                     tt.target()->drawBatch(pipelineBuilder, batch);
                 }