From 9e3f578adbeffb09ff37dd45d1eaef8f0cda2969 Mon Sep 17 00:00:00 2001 From: Chris Dalton Date: Tue, 24 Apr 2018 01:14:19 +0000 Subject: Revert "ccpr: Don't preempt the convex path renderer" This reverts commit 1804b3528c53f52664d9d344950f38e62bf7a71f. Reason for revert: Didn't help Original change's description: > ccpr: Don't preempt the convex path renderer > > It seems to perform better on RRects from web pages. > > Bug: skia:7825 > Change-Id: Ibecf33849c6d14e7486d9de740b1cc42f274080f > Reviewed-on: https://skia-review.googlesource.com/122626 > Reviewed-by: Brian Osman > Commit-Queue: Chris Dalton TBR=brianosman@google.com,csmartdalton@google.com # Not skipping CQ checks because original CL landed > 1 day ago. Bug: skia:7825 Change-Id: I06ca833c09f43f4e01989699c88610ae2ef72516 Reviewed-on: https://skia-review.googlesource.com/123381 Reviewed-by: Chris Dalton Commit-Queue: Chris Dalton --- src/gpu/GrPathRendererChain.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/gpu') diff --git a/src/gpu/GrPathRendererChain.cpp b/src/gpu/GrPathRendererChain.cpp index 2e48ce868b..9a4deb58ce 100644 --- a/src/gpu/GrPathRendererChain.cpp +++ b/src/gpu/GrPathRendererChain.cpp @@ -49,9 +49,6 @@ 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()); - if (options.fGpuPathRenderers & GpuPathRenderers::kAAConvex) { - fChain.push_back(sk_make_sp()); - } if (options.fGpuPathRenderers & GpuPathRenderers::kCoverageCounting) { bool drawCachablePaths = !options.fAllowPathMaskCaching; if (auto ccpr = GrCoverageCountingPathRenderer::CreateIfSupported(*context->caps(), @@ -61,6 +58,9 @@ GrPathRendererChain::GrPathRendererChain(GrContext* context, const Options& opti fChain.push_back(std::move(ccpr)); } } + if (options.fGpuPathRenderers & GpuPathRenderers::kAAConvex) { + fChain.push_back(sk_make_sp()); + } if (options.fGpuPathRenderers & GpuPathRenderers::kAALinearizing) { fChain.push_back(sk_make_sp()); } -- cgit v1.2.3