From f57c6de7843a74a0723f1ba4a82b7c9f43a33e1a Mon Sep 17 00:00:00 2001 From: Jim Van Verth Date: Fri, 29 Sep 2017 18:42:13 +0000 Subject: [PATCH] Revert "Enable coverage counting path rendering on non-Android" This reverts commit c739b7260a36ed4f9ea803991909a438629ca1d2. Reason for revert: Turning tree red. Original change's description: > 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 > Reviewed-by: Mike Reed > Commit-Queue: Chris Dalton TBR=djsollen@google.com,csmartdalton@google.com,reed@google.com Change-Id: I89ef472a95320ff21684ca697295cd8b3939322e No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: skia: Reviewed-on: https://skia-review.googlesource.com/53522 Reviewed-by: Jim Van Verth Commit-Queue: Jim Van Verth --- include/private/GrTypesPriv.h | 4 +++- src/gpu/GrPathRendererChain.cpp | 3 --- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/include/private/GrTypesPriv.h b/include/private/GrTypesPriv.h index e1e797bb3c..04a0111744 100644 --- a/include/private/GrTypesPriv.h +++ b/include/private/GrTypesPriv.h @@ -757,7 +757,9 @@ enum class GpuPathRenderers { 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 39ad9fb839..b982a32e94 100644 --- a/src/gpu/GrPathRendererChain.cpp +++ b/src/gpu/GrPathRendererChain.cpp @@ -50,15 +50,12 @@ 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()); - // 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()); }