diff options
| author |  robertphillips <robertphillips@google.com> | 2016-07-13 09:18:21 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-07-13 09:18:21 -0700 |
| commit | 59cf61ab0384286ebc57ecfb67e2f15ab4846250 (patch) | |
| tree | 8c3b6a6a373cfe7ff25262f8a454269f6806aea9 /src/gpu/batches | |
| parent | 0e1161d03f40fc1638481222b06fb74f6a9c734a (diff) | |
Retract PipelineBuilder from GrClip::apply
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2147443004
Review-Url: https://codereview.chromium.org/2147443004
Diffstat (limited to 'src/gpu/batches')
| -rw-r--r-- | src/gpu/batches/GrStencilAndCoverPathRenderer.cpp | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/src/gpu/batches/GrStencilAndCoverPathRenderer.cpp b/src/gpu/batches/GrStencilAndCoverPathRenderer.cpp index 5f98cfd15c..01193ad0aa 100644 --- a/src/gpu/batches/GrStencilAndCoverPathRenderer.cpp +++ b/src/gpu/batches/GrStencilAndCoverPathRenderer.cpp @@ -74,15 +74,9 @@ void GrStencilAndCoverPathRenderer::onStencilPath(const StencilPathArgs& args) { SkPath path; args.fShape->asPath(&path); - GrPaint paint; - paint.setXPFactory(GrDisableColorXPFactory::Make()); - paint.setAntiAlias(args.fIsAA); - - const GrPipelineBuilder pipelineBuilder(paint, args.fIsAA); - SkAutoTUnref<GrPath> p(get_gr_path(fResourceProvider, path, GrStyle::SimpleFill())); - args.fDrawContext->drawContextPriv().stencilPath(pipelineBuilder, *args.fClip, - *args.fViewMatrix, p, p->getFillType()); + args.fDrawContext->drawContextPriv().stencilPath(*args.fClip, nullptr, args.fIsAA, + *args.fViewMatrix, p); } bool GrStencilAndCoverPathRenderer::onDrawPath(const DrawPathArgs& args) { @@ -113,13 +107,10 @@ bool GrStencilAndCoverPathRenderer::onDrawPath(const DrawPathArgs& args) { ); // fake inverse with a stencil and cover - { - GrPipelineBuilder pipelineBuilder(*args.fPaint, args.fPaint->isAntiAlias()); - pipelineBuilder.setUserStencil(&kInvertedCoverPass); - - args.fDrawContext->drawContextPriv().stencilPath(pipelineBuilder, *args.fClip, - viewMatrix, p, p->getFillType()); - } + args.fDrawContext->drawContextPriv().stencilPath(*args.fClip, + &kInvertedCoverPass, + args.fPaint->isAntiAlias(), + viewMatrix, p); SkMatrix invert = SkMatrix::I(); SkRect bounds = |