Revert "Enable coverage counting path rendering except on Android framework"
This reverts commit 196efbf71cdd9a64b807e5e869cd45da5a66ac36.
Reason for revert: 1k SKPs GPU bot fails, perf regressions to look into.
Original change's description:
> Enable coverage counting path rendering except on Android framework
>
> Android framework will come after collecting a bit more data.
>
> Bug: skia:
> Change-Id: I6f4738e457f09c976b8bf282153ca75160a1d91c
> Reviewed-on: https://skia-review.googlesource.com/55563
> Commit-Queue: Chris Dalton <csmartdalton@google.com>
> Reviewed-by: Brian Salomon <bsalomon@google.com>
TBR=bsalomon@google.com,csmartdalton@google.com
# Not skipping CQ checks because original CL landed > 1 day ago.
Bug: skia:
Change-Id: I3f1a7022414ccec80541772d9912065fa4efd74e
Reviewed-on: https://skia-review.googlesource.com/57300
Reviewed-by: Chris Dalton <csmartdalton@google.com>
Commit-Queue: Chris Dalton <csmartdalton@google.com>
diff --git a/include/private/GrTypesPriv.h b/include/private/GrTypesPriv.h
index e1e797b..04a0111 100644
--- a/include/private/GrTypesPriv.h
+++ b/include/private/GrTypesPriv.h
@@ -757,7 +757,9 @@
kTessellating = 1 << 7,
kAll = (kTessellating | (kTessellating - 1)),
- kDefault = kAll
+
+ // Temporarily disabling CCPR by default until it has had a time to soak.
+ kDefault = kAll & ~kCoverageCounting,
};
GR_MAKE_BITFIELD_CLASS_OPS(GpuPathRenderers)
diff --git a/src/gpu/GrPathRendererChain.cpp b/src/gpu/GrPathRendererChain.cpp
index 39ad9fb..b982a32 100644
--- a/src/gpu/GrPathRendererChain.cpp
+++ b/src/gpu/GrPathRendererChain.cpp
@@ -50,15 +50,12 @@
// AA hairline path renderer is very specialized - no other renderer can do this job well
fChain.push_back(sk_make_sp<GrAAHairLinePathRenderer>());
- // Temporarily disable ccpr on Android while we collect data.
-#ifndef SK_BUILD_FOR_ANDROID_FRAMEWORK
if (options.fGpuPathRenderers & GpuPathRenderers::kCoverageCounting) {
if (auto ccpr = GrCoverageCountingPathRenderer::CreateIfSupported(*context->caps())) {
context->contextPriv().addOnFlushCallbackObject(ccpr.get());
fChain.push_back(std::move(ccpr));
}
}
-#endif
if (options.fGpuPathRenderers & GpuPathRenderers::kAAConvex) {
fChain.push_back(sk_make_sp<GrAAConvexPathRenderer>());
}