diff options
| author |  robertphillips <robertphillips@google.com> | 2016-07-21 12:04:08 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-07-21 12:04:08 -0700 |
| commit | 2895eeb11a9f0d9c0018d49dd4bc45f6c6fc062c (patch) | |
| tree | 3509c01c16bd72405503e587553820e379b534c5 /src/gpu/batches/GrAAConvexPathRenderer.cpp | |
| parent | f25bff95db388554027c78df709f78f8278fffed (diff) | |
Retract PipelineBuilder some more
The main part of this CL is widening SkDrawContext::drawBatch's API to accept the userStencilSettings & drawFace
There is some ancillary spookiness related to expanding the should_apply_coverage_aa & mustUseHWAA methods to encompass mixedSamples
Calved off:
https://codereview.chromium.org/2165283002/ (Remove DrawFace enum from GrPipelineBuilder)
https://codereview.chromium.org/2167183002/ (Minor change to Ganesh path renderers)
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2092893003
Review-Url: https://codereview.chromium.org/2092893003
Diffstat (limited to 'src/gpu/batches/GrAAConvexPathRenderer.cpp')
| -rw-r--r-- | src/gpu/batches/GrAAConvexPathRenderer.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/gpu/batches/GrAAConvexPathRenderer.cpp b/src/gpu/batches/GrAAConvexPathRenderer.cpp index b0ddaeb65c..3208eadb47 100644 --- a/src/gpu/batches/GrAAConvexPathRenderer.cpp +++ b/src/gpu/batches/GrAAConvexPathRenderer.cpp @@ -17,7 +17,6 @@ #include "GrInvariantOutput.h" #include "GrPathUtils.h" #include "GrProcessor.h" -#include "GrPipelineBuilder.h" #include "SkGeometry.h" #include "SkPathPriv.h" #include "SkString.h" @@ -1001,10 +1000,7 @@ bool GrAAConvexPathRenderer::onDrawPath(const DrawPathArgs& args) { SkAutoTUnref<GrDrawBatch> batch(new AAConvexPathBatch(args.fPaint->getColor(), *args.fViewMatrix, path)); - GrPipelineBuilder pipelineBuilder(*args.fPaint); - pipelineBuilder.setUserStencil(args.fUserStencilSettings); - - args.fDrawContext->drawBatch(pipelineBuilder, *args.fClip, batch); + args.fDrawContext->drawBatch(*args.fPaint, *args.fClip, *args.fUserStencilSettings, batch); return true; |