diff options
| -rw-r--r-- | include/private/GrTypesPriv.h | 4 | ||||
| -rw-r--r-- | src/gpu/GrPathRendererChain.cpp | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/include/private/GrTypesPriv.h b/include/private/GrTypesPriv.h index 04a0111744..e1e797bb3c 100644 --- a/include/private/GrTypesPriv.h +++ b/include/private/GrTypesPriv.h @@ -757,9 +757,7 @@ enum class GpuPathRenderers { 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 b982a32e94..39ad9fb839 100644 --- a/src/gpu/GrPathRendererChain.cpp +++ b/src/gpu/GrPathRendererChain.cpp @@ -50,12 +50,15 @@ GrPathRendererChain::GrPathRendererChain(GrContext* context, const Options& opti // 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>()); } |