Create GrDraw and start fast pathing src over rects

src/gpu/batches/GrAAFillRectBatch.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 "GrAAFillRectBatch.h"
 
 #include "GrColor.h"
@@ skipping 270 matching lines @@
                           const GrPipelineOptimizations& opts) {
         generate_aa_fill_rect_geometry(vertices, vertexStride,
                                        geo.fColor, geo.fViewMatrix, geo.fRect, geo.fDevRect, opts,
                                        &geo.fLocalMatrix);
     }
 };
 
 typedef GrTInstanceBatch<AAFillRectBatchNoLocalMatrixImp> AAFillRectBatchNoLocalMatrix;
 typedef GrTInstanceBatch<AAFillRectBatchLocalMatrixImp> AAFillRectBatchLocalMatrix;
 
-inline 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;
+inline static void setup_geo(AAFillRectBatchNoLocalMatrix::Geometry* geo, GrColor color,
+                             const SkMatrix& viewMatrix, const SkRect& rect,
+                             const SkRect& devRect) {
+    geo->fColor = color;
+    geo->fViewMatrix = viewMatrix;
+    geo->fRect = rect;
+    geo->fDevRect = devRect;
 }
 
-inline 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;
+inline static void setup_geo(AAFillRectBatchLocalMatrix::Geometry* geo, GrColor color,
+                             const SkMatrix& viewMatrix, const SkMatrix& localMatrix,
+                             const SkRect& rect, const SkRect& devRect) {
+    geo->fColor = color;
+    geo->fViewMatrix = viewMatrix;
+    geo->fLocalMatrix = localMatrix;
+    geo->fRect = rect;
+    geo->fDevRect = devRect;
 }
 
 namespace GrAAFillRectBatch {
 
 GrDrawBatch* Create(GrColor color,
                     const SkMatrix& viewMatrix,
                     const SkRect& rect,
                     const SkRect& devRect) {
     AAFillRectBatchNoLocalMatrix* batch = AAFillRectBatchNoLocalMatrix::Create();
-    append_to_batch(batch, color, viewMatrix, rect, devRect);
+    setup_geo(&batch->geoData()->push_back(), color, viewMatrix, rect, devRect);
     batch->init();
     return batch;
 }
 
 GrDrawBatch* Create(GrColor color,
                     const SkMatrix& viewMatrix,
                     const SkMatrix& localMatrix,
-                    const SkRect& rect,
-                    const SkRect& devRect) {
+                    const SkRect& rect) {
+    //map rect
+    SkRect devRect;
+    viewMatrix.mapRect(&devRect, rect);
+
     AAFillRectBatchLocalMatrix* batch = AAFillRectBatchLocalMatrix::Create();
-    append_to_batch(batch, color, viewMatrix, localMatrix, rect, devRect);
+    setup_geo(&batch->geoData()->push_back(), color, viewMatrix, localMatrix, rect, devRect);
     batch->init();
     return batch;
 }
 
-void Append(GrBatch* origBatch,
+bool Append(GrBatch* origBatch,
             GrColor color,
             const SkMatrix& viewMatrix,
-            const SkRect& rect,
-            const SkRect& devRect) {
+            const SkRect& rect) {
+    // map rect
+    SkRect devRect;
+    viewMatrix.mapRect(&devRect, rect);
+
     AAFillRectBatchNoLocalMatrix* batch = origBatch->cast<AAFillRectBatchNoLocalMatrix>();
-    append_to_batch(batch, color, viewMatrix, rect, devRect);
-    batch->updateBoundsAfterAppend();
+    AAFillRectBatchNoLocalMatrix::Geometry geo;
+    setup_geo(&geo, color, viewMatrix, rect, devRect);
+    return batch->appendIfPossible(geo);
 }
 
-void Append(GrBatch* origBatch,
+bool 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->updateBoundsAfterAppend();
+    AAFillRectBatchLocalMatrix::Geometry geo;
+    setup_geo(&geo, color, viewMatrix, localMatrix, rect, devRect);
+    return batch->appendIfPossible(geo);
 }
 
 };
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #ifdef GR_TEST_UTILS
 
 #include "GrBatchTest.h"
 
 DRAW_BATCH_TEST_DEFINE(AAFillRectBatch) {
     GrColor color = GrRandomColor(random);
     SkMatrix viewMatrix = GrTest::TestMatrixInvertible(random);
     SkRect rect = GrTest::TestRect(random);
     SkRect devRect = GrTest::TestRect(random);
     return GrAAFillRectBatch::Create(color, viewMatrix, rect, devRect);
 }
 
 DRAW_BATCH_TEST_DEFINE(AAFillRectBatchLocalMatrix) {
     GrColor color = GrRandomColor(random);
     SkMatrix viewMatrix = GrTest::TestMatrixInvertible(random);
     SkMatrix localMatrix = GrTest::TestMatrix(random);
     SkRect rect = GrTest::TestRect(random);
-    SkRect devRect = GrTest::TestRect(random);
-    return GrAAFillRectBatch::Create(color, viewMatrix, localMatrix, rect, devRect);
+    return GrAAFillRectBatch::Create(color, viewMatrix, localMatrix, rect);
 }
 
 #endif