commit db91c6e7fbfc9d1d8fd203f7e08eefb602e4a0b9
author Chris Dalton <csmartdalton@google.com> Fri Sep 08 16:25:08 2017 -0600
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Sep 12 20:04:20 2017 +0000
tree cb13d0253d2161a7e995bc94fc8cedb85df7dd04
parent a640c49b7ecf667696542143edec96d10a940592

Improve heuristics for when to use ccpr

Gives the convex and tessellating renderers first claim on larger
paths, and the distance field renderer first claim on complex,
non-volatile paths. This also requires plumbing the clip bounds
through GrPathRenderer::CanDrawPathArgs.

Bug: skia:
Change-Id: I16e1d35ad5ee63251e33f113b1579cbba60456da
Reviewed-on: https://skia-review.googlesource.com/42224
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Chris Dalton <csmartdalton@google.com>

src/gpu/GrReducedClip.cpp

diff --git a/src/gpu/GrReducedClip.cpp b/src/gpu/GrReducedClip.cpp
index ed5ce8a..22316c5 100644
--- a/src/gpu/GrReducedClip.cpp
+++ b/src/gpu/GrReducedClip.cpp
@@ -743,6 +743,7 @@
             GrShape shape(clipPath, GrStyle::SimpleFill());
             GrPathRenderer::CanDrawPathArgs canDrawArgs;
             canDrawArgs.fCaps = context->caps();
+            canDrawArgs.fClipConservativeBounds = &stencilClip.fixedClip().scissorRect();
             canDrawArgs.fViewMatrix = &SkMatrix::I();
             canDrawArgs.fShape = &shape;
             canDrawArgs.fAAType = aaType;
@@ -793,6 +794,7 @@
                                                           &kDrawToStencil,
                                                           renderTargetContext,
                                                           &stencilClip.fixedClip(),
+                                                          &stencilClip.fixedClip().scissorRect(),
                                                           &SkMatrix::I(),
                                                           &shape,
                                                           aaType,
@@ -803,6 +805,7 @@
                         args.fContext = context;
                         args.fRenderTargetContext = renderTargetContext;
                         args.fClip = &stencilClip.fixedClip();
+                        args.fClipConservativeBounds = &stencilClip.fixedClip().scissorRect();
                         args.fViewMatrix = &SkMatrix::I();
                         args.fAAType = aaType;
                         args.fShape = &shape;
@@ -829,6 +832,7 @@
                                                       *pass,
                                                       renderTargetContext,
                                                       &stencilClip,
+                                                      &stencilClip.fixedClip().scissorRect(),
                                                       &SkMatrix::I(),
                                                       &shape,
                                                       aaType,