Enable coverage counting path rendering on non-Android
Bug: skia:
Change-Id: Ife4c4378bf4323fb4a58fecfade09320ebc28026
Reviewed-on: https://skia-review.googlesource.com/53000
Reviewed-by: Derek Sollenberger <djsollen@google.com>
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Chris Dalton <csmartdalton@google.com>
diff --git a/include/private/GrTypesPriv.h b/include/private/GrTypesPriv.h
index 04a0111..e1e797b 100644
--- a/include/private/GrTypesPriv.h
+++ b/include/private/GrTypesPriv.h
@@ -757,9 +757,7 @@
kTessellating = 1 << 7,
kAll = (kTessellating | (kTessellating - 1)),
-
- // Temporarily disabling CCPR by default until it has had a time to soak.
- kDefault = kAll & ~kCoverageCounting,
+ kDefault = kAll
};
GR_MAKE_BITFIELD_CLASS_OPS(GpuPathRenderers)
diff --git a/src/gpu/GrPathRendererChain.cpp b/src/gpu/GrPathRendererChain.cpp
index b982a32..39ad9fb 100644
--- a/src/gpu/GrPathRendererChain.cpp
+++ b/src/gpu/GrPathRendererChain.cpp
@@ -50,12 +50,15 @@
// 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>());
}