Create append methods in batch namespaces

src/gpu/batches/GrAAFillRectBatch.cpp

Index: src/gpu/batches/GrAAFillRectBatch.cpp
diff --git a/src/gpu/batches/GrAAFillRectBatch.cpp b/src/gpu/batches/GrAAFillRectBatch.cpp
index 69fd0ef65bc23325eed5ea5a1cd59148d7887850..4ba9c1822ee315072d31db6b2c4cda85ab771011 100644
--- a/src/gpu/batches/GrAAFillRectBatch.cpp
+++ b/src/gpu/batches/GrAAFillRectBatch.cpp
@@ -199,6 +199,11 @@ public:
     static void SetBounds(const Geometry& geo, SkRect* outBounds) {
         *outBounds = geo.fDevRect;
     }
+
+    template <class Geometry>
+    static void UpdateBounds(const Geometry& geo, SkRect* outBounds) {
+        outBounds->join(geo.fDevRect);
+    }
 };
 
 class AAFillRectBatchNoLocalMatrixImp : public AAFillRectBatchBase {
@@ -283,6 +288,26 @@ public:
 typedef GrTInstanceBatch<AAFillRectBatchNoLocalMatrixImp> AAFillRectBatchNoLocalMatrix;
 typedef GrTInstanceBatch<AAFillRectBatchLocalMatrixImp> AAFillRectBatchLocalMatrix;
 

[robertphillips, 2015/09/18 17:42:25]

"inline" these to document our hopes & prayers ?

[joshualitt, 2015/09/18 18:34:10]

Acknowledged.

+static void append_to_batch(AAFillRectBatchNoLocalMatrix* batch, GrColor color,
+                            const SkMatrix& viewMatrix, const SkRect& rect, const SkRect& devRect) {
+    AAFillRectBatchNoLocalMatrix::Geometry& geo = batch->geoData()->push_back();
+    geo.fColor = color;
+    geo.fViewMatrix = viewMatrix;
+    geo.fRect = rect;
+    geo.fDevRect = devRect;
+}
+
+static void append_to_batch(AAFillRectBatchLocalMatrix* batch, GrColor color,
+                            const SkMatrix& viewMatrix, const SkMatrix& localMatrix,
+                            const SkRect& rect, const SkRect& devRect) {
+    AAFillRectBatchLocalMatrix::Geometry& geo = batch->geoData()->push_back();
+    geo.fColor = color;
+    geo.fViewMatrix = viewMatrix;
+    geo.fLocalMatrix = localMatrix;
+    geo.fRect = rect;
+    geo.fDevRect = devRect;
+}
+
 namespace GrAAFillRectBatch {
 
 GrDrawBatch* Create(GrColor color,
@@ -290,11 +315,7 @@ GrDrawBatch* Create(GrColor color,
                     const SkRect& rect,
                     const SkRect& devRect) {
     AAFillRectBatchNoLocalMatrix* batch = AAFillRectBatchNoLocalMatrix::Create();
-    AAFillRectBatchNoLocalMatrix::Geometry& geo = *batch->geometry();
-    geo.fColor = color;
-    geo.fViewMatrix = viewMatrix;
-    geo.fRect = rect;
-    geo.fDevRect = devRect;
+    append_to_batch(batch, color, viewMatrix, rect, devRect);
     batch->init();
     return batch;
 }
@@ -305,16 +326,32 @@ GrDrawBatch* Create(GrColor color,
                     const SkRect& rect,
                     const SkRect& devRect) {
     AAFillRectBatchLocalMatrix* batch = AAFillRectBatchLocalMatrix::Create();
-    AAFillRectBatchLocalMatrix::Geometry& geo = *batch->geometry();
-    geo.fColor = color;
-    geo.fViewMatrix = viewMatrix;
-    geo.fLocalMatrix = localMatrix;
-    geo.fRect = rect;
-    geo.fDevRect = devRect;
+    append_to_batch(batch, color, viewMatrix, localMatrix, rect, devRect);
     batch->init();
     return batch;
 }
 
+void Append(GrBatch* origBatch,
+            GrColor color,
+            const SkMatrix& viewMatrix,
+            const SkRect& rect,
+            const SkRect& devRect) {
+    AAFillRectBatchNoLocalMatrix* batch = origBatch->cast<AAFillRectBatchNoLocalMatrix>();
+    append_to_batch(batch, color, viewMatrix, rect, devRect);
+    batch->updateBounds();
+}
+
+void Append(GrBatch* origBatch,
+            GrColor color,
+            const SkMatrix& viewMatrix,
+            const SkMatrix& localMatrix,
+            const SkRect& rect,
+            const SkRect& devRect) {
+    AAFillRectBatchLocalMatrix* batch = origBatch->cast<AAFillRectBatchLocalMatrix>();
+    append_to_batch(batch, color, viewMatrix, localMatrix, rect, devRect);
+    batch->updateBounds();
+}
+
 };
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////