commit 4b6b1dd2180ede7ec944d77b295095b6dfcf6416
author Adlai Holler <adlai@google.com> Tue May 04 10:19:28 2021 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue May 04 16:54:05 2021 +0000
tree 83cb8e10867e139638142feee746cf48e6187d18
parent 2776dd161e7679d6a35458a8da719f1d80f24356

Re-enable CCPR atlasing + reordering

CCPR atlasing now handles merged tasks correctly so they can work
together happily again.

Bug: skia:10877, skia:11731
Change-Id: Id15c8fc3ed0560150f5c373651f5c583239f3e09
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/404136
Commit-Queue: Adlai Holler <adlai@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>

src/gpu/GrPathRendererChain.cpp

diff --git a/src/gpu/GrPathRendererChain.cpp b/src/gpu/GrPathRendererChain.cpp
index 081b9a2..624e31a 100644
--- a/src/gpu/GrPathRendererChain.cpp
+++ b/src/gpu/GrPathRendererChain.cpp
@@ -35,14 +35,11 @@
         fChain.push_back(sk_make_sp<GrAAConvexPathRenderer>());
     }
     if (options.fGpuPathRenderers & GpuPathRenderers::kCoverageCounting) {
-        // opsTask IDs for the atlas have an issue with --reduceOpsTaskSplitting: skbug.com/11731
-        if (context->priv().options().fReduceOpsTaskSplitting != GrContextOptions::Enable::kYes) {
-            fCoverageCountingPathRenderer = GrCoverageCountingPathRenderer::CreateIfSupported(caps);
-            if (fCoverageCountingPathRenderer) {
-                // Don't add to the chain. This is only for clips.
-                // TODO: Remove from here.
-                context->priv().addOnFlushCallbackObject(fCoverageCountingPathRenderer.get());
-            }
+        fCoverageCountingPathRenderer = GrCoverageCountingPathRenderer::CreateIfSupported(caps);
+        if (fCoverageCountingPathRenderer) {
+            // Don't add to the chain. This is only for clips.
+            // TODO: Remove from here.
+            context->priv().addOnFlushCallbackObject(fCoverageCountingPathRenderer.get());
         }
     }
     if (options.fGpuPathRenderers & GpuPathRenderers::kAAHairline) {