diff options
| author |  Chris Dalton <csmartdalton@google.com> | 2018-04-27 13:05:19 -0600 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-04-27 20:27:18 +0000 |
| commit | 1dec19a29eab9f861cf8a1df5ff74e7879efb14d (patch) | |
| tree | 89d0aca2b1102cba98bf7cba4c21699bbae05180 /src/gpu/GrClipStackClip.cpp | |
| parent | cb31248132cc5ab08b0333b1ce0ab189dc69d155 (diff) | |
ccpr: Remove canMakeClipProcessor
Now that conics are supported we can make a ccpr clip FP out of any
path. No need to ask. And the 'fDrawCachablePaths' check was redundant
since clip paths are always volatile anyway (for now).
Bug: skia:
Change-Id: I670474a3b91f1c252ed323eb627bbb109788e6b8
Reviewed-on: https://skia-review.googlesource.com/124362
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Chris Dalton <csmartdalton@google.com>
Diffstat (limited to 'src/gpu/GrClipStackClip.cpp')
| -rw-r--r-- | src/gpu/GrClipStackClip.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gpu/GrClipStackClip.cpp b/src/gpu/GrClipStackClip.cpp index fe8d10095c..f5c08f07eb 100644 --- a/src/gpu/GrClipStackClip.cpp +++ b/src/gpu/GrClipStackClip.cpp @@ -205,7 +205,8 @@ bool GrClipStackClip::apply(GrContext* context, GrRenderTargetContext* renderTar } auto* ccpr = context->contextPriv().drawingManager()->getCoverageCountingPathRenderer(); - GrReducedClip reducedClip(*fStack, devBounds, caps, maxWindowRectangles, maxAnalyticFPs, ccpr); + GrReducedClip reducedClip(*fStack, devBounds, caps, maxWindowRectangles, maxAnalyticFPs, + ccpr ? maxAnalyticFPs : 0); if (InitialState::kAllOut == reducedClip.initialState() && reducedClip.maskElements().isEmpty()) { return false; @@ -231,7 +232,7 @@ bool GrClipStackClip::apply(GrContext* context, GrRenderTargetContext* renderTar // can cause a flush or otherwise change which opList our draw is going into. uint32_t opListID = renderTargetContext->getOpList()->uniqueID(); int rtWidth = renderTargetContext->width(), rtHeight = renderTargetContext->height(); - if (auto clipFPs = reducedClip.finishAndDetachAnalyticFPs(proxyProvider, opListID, + if (auto clipFPs = reducedClip.finishAndDetachAnalyticFPs(ccpr, proxyProvider, opListID, rtWidth, rtHeight)) { out->addCoverageFP(std::move(clipFPs)); } |