commit bbd459d82c9f8bfcdbafef639d232f7dc63a8873
author Robert Phillips <robertphillips@google.com> Tue Oct 29 14:40:03 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Oct 30 14:18:16 2019 +0000
tree c44ca8f0b4abf572bddd228921d4304b9832d5f0
parent 7da048b5e8f17374bcd5baf48539eaa7ebe40e5c

Allocate all vertex data in one go w/in GrTextureOp

This will hopefully reduce the overhead of prePreparing the vertex data (i.e., only one memcpy to use the precomputed data) and set us up for using the full extent of the index buffers.

Note this CL also contains a refactoring to share more code between onPrePrepareDraws and onPrepareDraws (i.e., the FillInData method).

Change-Id: Ia0e482332c8108e24b82743b82fdf53840c9b009
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/250800
Reviewed-by: Michael Ludwig <michaelludwig@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>

src/gpu/ops/GrFillRectOp.cpp

diff --git a/src/gpu/ops/GrFillRectOp.cpp b/src/gpu/ops/GrFillRectOp.cpp
index bcdd878..5837a4b 100644
--- a/src/gpu/ops/GrFillRectOp.cpp
+++ b/src/gpu/ops/GrFillRectOp.cpp
@@ -249,21 +249,15 @@
 
         bool upgradeToCoverageAAOnMerge = false;
         if (fHelper.aaType() != that->fHelper.aaType()) {
-            if (!GrSimpleMeshDrawOpHelper::CanUpgradeAAOnMerge(fHelper.aaType(),
-                                                               that->fHelper.aaType())) {
+            if (!CanUpgradeAAOnMerge(fHelper.aaType(), that->fHelper.aaType())) {
                 return CombineResult::kCannotCombine;
             }
             upgradeToCoverageAAOnMerge = true;
         }
 
-        if (fHelper.aaType() == GrAAType::kCoverage || upgradeToCoverageAAOnMerge) {
-            if (fQuads.count() + that->fQuads.count() > GrResourceProvider::MaxNumAAQuads()) {
-                return CombineResult::kCannotCombine;
-            }
-        } else {
-            if (fQuads.count() + that->fQuads.count() > GrResourceProvider::MaxNumNonAAQuads()) {
-                return CombineResult::kCannotCombine;
-            }
+        if (CombinedQuadCountWillOverflow(fHelper.aaType(), upgradeToCoverageAAOnMerge,
+                                          fQuads.count() + that->fQuads.count())) {
+            return CombineResult::kCannotCombine;
         }
 
         // Unlike most users of the draw op helper, this op can merge none-aa and coverage-aa draw