Create append methods in batch namespaces

src/gpu/batches/GrNonAAFillRectBatch.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrNonAAFillRectBatch.h"
 
 #include "GrBatchFlushState.h"
@@ skipping 16 matching lines @@
     }
 
     static const GrIndexBuffer* GetIndexBuffer(GrResourceProvider* rp) {
         return rp->refQuadIndexBuffer();
     }
 
     template <typename Geometry>
     static void SetBounds(const Geometry& geo, SkRect* outBounds) {
         geo.fViewMatrix.mapRect(outBounds, geo.fRect);
     }
+
+    template <typename Geometry>
+    static void UpdateBoundsAfterAppend(const Geometry& geo, SkRect* outBounds) {
+        SkRect bounds = geo.fRect;
+        geo.fViewMatrix.mapRect(&bounds);
+        outBounds->join(bounds);
+    }
 };
 
 /** We always use per-vertex colors so that rects can be batched across color changes. Sometimes
     we  have explicit local coords and sometimes not. We *could* always provide explicit local
     coords and just duplicate the positions when the caller hasn't provided a local coord rect,
     but we haven't seen a use case which frequently switches between local rect and no local
     rect draws.
 
     The vertex attrib order is always pos, color, [local coords].
  */
@@ skipping 133 matching lines @@
             tesselate(vertices, vertexStride, geo.fColor, geo.fViewMatrix, geo.fRect, &quad);
         } else {
             tesselate(vertices, vertexStride, geo.fColor, geo.fViewMatrix, geo.fRect, nullptr);
         }
     }
 };
 
 typedef GrTInstanceBatch<NonAAFillRectBatchImp> NonAAFillRectBatchSimple;
 typedef GrTInstanceBatch<NonAAFillRectBatchPerspectiveImp> NonAAFillRectBatchPerspective;
 
-namespace GrNonAAFillRectBatch {
-
-GrDrawBatch* Create(GrColor color,
-                    const SkMatrix& viewMatrix,
-                    const SkRect& rect,
-                    const SkRect* localRect,
-                    const SkMatrix* localMatrix) {
+inline static void append_to_batch(NonAAFillRectBatchSimple* batch, GrColor color,
+                                   const SkMatrix& viewMatrix, const SkRect& rect,
+                                   const SkRect* localRect, const SkMatrix* localMatrix) {
     SkASSERT(!viewMatrix.hasPerspective() && (!localMatrix || !localMatrix->hasPerspective()));
-    NonAAFillRectBatchSimple* batch = NonAAFillRectBatchSimple::Create();
-    NonAAFillRectBatchSimple::Geometry& geo = *batch->geometry();
+    NonAAFillRectBatchSimple::Geometry& geo = batch->geoData()->push_back();
 
     geo.fColor = color;
     geo.fViewMatrix = viewMatrix;
     geo.fRect = rect;
 
     if (localRect && localMatrix) {
         geo.fLocalQuad.setFromMappedRect(*localRect, *localMatrix);
     } else if (localRect) {
         geo.fLocalQuad.set(*localRect);
     } else if (localMatrix) {
         geo.fLocalQuad.setFromMappedRect(rect, *localMatrix);
     } else {
         geo.fLocalQuad.set(rect);
     }
-
-    batch->init();
-    return batch;
 }
 
-GrDrawBatch* CreateWithPerspective(GrColor color,
-                                   const SkMatrix& viewMatrix,
-                                   const SkRect& rect,
-                                   const SkRect* localRect,
-                                   const SkMatrix* localMatrix) {
+inline static void append_to_batch(NonAAFillRectBatchPerspective* batch, GrColor color,
+                                   const SkMatrix& viewMatrix, const SkRect& rect,
+                                   const SkRect* localRect, const SkMatrix* localMatrix) {
     SkASSERT(viewMatrix.hasPerspective() || (localMatrix && localMatrix->hasPerspective()));
-    NonAAFillRectBatchPerspective* batch = NonAAFillRectBatchPerspective::Create();
-    NonAAFillRectBatchPerspective::Geometry& geo = *batch->geometry();
+    NonAAFillRectBatchPerspective::Geometry& geo = batch->geoData()->push_back();
 
     geo.fColor = color;
     geo.fViewMatrix = viewMatrix;
     geo.fRect = rect;
     geo.fHasLocalRect = SkToBool(localRect);
     geo.fHasLocalMatrix = SkToBool(localMatrix);
     if (localMatrix) {
         geo.fLocalMatrix = *localMatrix;
     }
     if (localRect) {
         geo.fLocalRect = *localRect;
     }
 
+}
+
+namespace GrNonAAFillRectBatch {
+
+GrDrawBatch* Create(GrColor color,
+                    const SkMatrix& viewMatrix,
+                    const SkRect& rect,
+                    const SkRect* localRect,
+                    const SkMatrix* localMatrix) {
+    NonAAFillRectBatchSimple* batch = NonAAFillRectBatchSimple::Create();
+    append_to_batch(batch, color, viewMatrix, rect, localRect, localMatrix);
     batch->init();
     return batch;
 }
 
+GrDrawBatch* CreateWithPerspective(GrColor color,
+                                   const SkMatrix& viewMatrix,
+                                   const SkRect& rect,
+                                   const SkRect* localRect,
+                                   const SkMatrix* localMatrix) {
+    NonAAFillRectBatchPerspective* batch = NonAAFillRectBatchPerspective::Create();
+    append_to_batch(batch, color, viewMatrix, rect, localRect, localMatrix);
+    batch->init();
+    return batch;
+}
+
+bool Append(GrBatch* origBatch,
+            GrColor color,
+            const SkMatrix& viewMatrix,
+            const SkRect& rect,
+            const SkRect* localRect,
+            const SkMatrix* localMatrix) {
+    bool usePerspective = viewMatrix.hasPerspective() ||
+                          (localMatrix && localMatrix->hasPerspective());
+
+    if (usePerspective && origBatch->classID() != NonAAFillRectBatchPerspective::ClassID()) {
+        return false;
+    }
+
+    if (!usePerspective) {
+        NonAAFillRectBatchSimple* batch = origBatch->cast<NonAAFillRectBatchSimple>();
+        append_to_batch(batch, color, viewMatrix, rect, localRect, localMatrix);
+        batch->updateBoundsAfterAppend();
+    } else {
+        NonAAFillRectBatchPerspective* batch = origBatch->cast<NonAAFillRectBatchPerspective>();
+        const NonAAFillRectBatchPerspective::Geometry& geo = batch->geoData()->back();
+
+        if (!geo.fViewMatrix.cheapEqualTo(viewMatrix) ||
+            geo.fHasLocalRect != SkToBool(localRect) ||
+            geo.fHasLocalMatrix != SkToBool(localMatrix) ||
+            (geo.fHasLocalMatrix && !geo.fLocalMatrix.cheapEqualTo(*localMatrix))) {
+            return false;
+        }
+
+        append_to_batch(batch, color, viewMatrix, rect, localRect, localMatrix);
+        batch->updateBoundsAfterAppend();
+    }
+
+    return true;
+}
+
 };
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #ifdef GR_TEST_UTILS
 
 #include "GrBatchTest.h"
 
 DRAW_BATCH_TEST_DEFINE(RectBatch) {
     GrColor color = GrRandomColor(random);
     SkRect rect = GrTest::TestRect(random);
     SkRect localRect = GrTest::TestRect(random);
     SkMatrix viewMatrix = GrTest::TestMatrixInvertible(random);
     SkMatrix localMatrix = GrTest::TestMatrix(random);
 
     bool hasLocalRect = random->nextBool();
     bool hasLocalMatrix = random->nextBool();
     return GrNonAAFillRectBatch::Create(color, viewMatrix, rect,
                                         hasLocalRect ? &localRect : nullptr,
                                         hasLocalMatrix ? &localMatrix : nullptr);
 }
 
 #endif