From 7c0998a130b5b1a64811defd17ab3266985515f4 Mon Sep 17 00:00:00 2001 From: Ben Wagner Date: Wed, 18 Jul 2018 21:24:11 +0000 Subject: Revert "Add kAAHairline to GpuPathRenderers" This reverts commit 880b9d302fadd6449a511b8664682f16cde7dd9c. Reason for revert: Appears to be breaking serialization. See https://ci.chromium.org/raw/build/logs.chromium.org/skia/20180718T201711.486335899Z_000000000077bbff/+/annotations Original change's description: > Add kAAHairline to GpuPathRenderers > > With the upcoming ccpr stroking, this will no longer be the only path > renderer that can handle hairlines. > > Bug: skia: > Change-Id: Idf2543f053c8603c80fcd647ca18ffd9860a85f3 > Reviewed-on: https://skia-review.googlesource.com/142246 > Reviewed-by: Brian Osman > Commit-Queue: Chris Dalton TBR=brianosman@google.com,csmartdalton@google.com Change-Id: I1967c2cf6b1f1307270bf62bb04130cdf84317b7 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: skia: Reviewed-on: https://skia-review.googlesource.com/142280 Reviewed-by: Ben Wagner Commit-Queue: Ben Wagner --- src/gpu/GrPathRendererChain.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/gpu/GrPathRendererChain.cpp b/src/gpu/GrPathRendererChain.cpp index 60c935ab08..6301045cb7 100644 --- a/src/gpu/GrPathRendererChain.cpp +++ b/src/gpu/GrPathRendererChain.cpp @@ -34,6 +34,10 @@ GrPathRendererChain::GrPathRendererChain(GrContext* context, const Options& opti fChain.push_back(std::move(pr)); } } + + // AA hairline path renderer is very specialized - no other renderer can do this job well + fChain.push_back(sk_make_sp()); + if (options.fGpuPathRenderers & GpuPathRenderers::kCoverageCounting) { using AllowCaching = GrCoverageCountingPathRenderer::AllowCaching; if (auto ccpr = GrCoverageCountingPathRenderer::CreateIfSupported( @@ -43,9 +47,6 @@ GrPathRendererChain::GrPathRendererChain(GrContext* context, const Options& opti fChain.push_back(std::move(ccpr)); } } - if (options.fGpuPathRenderers & GpuPathRenderers::kAAHairline) { - fChain.push_back(sk_make_sp()); - } if (options.fGpuPathRenderers & GpuPathRenderers::kAAConvex) { fChain.push_back(sk_make_sp()); } -- cgit v1.2.3