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/text | |
| 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/text')
| -rw-r--r-- | src/gpu/text/GrAtlasTextBlob.cpp | 5 | ||||
| -rw-r--r-- | src/gpu/text/GrStencilAndCoverTextContext.cpp | 8 |
2 files changed, 3 insertions, 10 deletions
diff --git a/src/gpu/text/GrAtlasTextBlob.cpp b/src/gpu/text/GrAtlasTextBlob.cpp index 12f35a38c8..0bea086869 100644 --- a/src/gpu/text/GrAtlasTextBlob.cpp +++ b/src/gpu/text/GrAtlasTextBlob.cpp @@ -10,7 +10,6 @@ #include "GrBlurUtils.h" #include "GrContext.h" #include "GrDrawContext.h" -#include "GrPipelineBuilder.h" #include "GrTextUtils.h" #include "SkColorFilter.h" #include "SkDrawFilter.h" @@ -324,9 +323,7 @@ void GrAtlasTextBlob::flushRun(GrDrawContext* dc, const GrPaint& grPaint, distanceAdjustTable, dc->isGammaCorrect(), cache)); - GrPipelineBuilder pipelineBuilder(grPaint, dc->mustUseHWAA(grPaint)); - - dc->drawBatch(pipelineBuilder, clip, batch); + dc->drawBatch(grPaint, clip, GrUserStencilSettings::kUnused, batch); } } diff --git a/src/gpu/text/GrStencilAndCoverTextContext.cpp b/src/gpu/text/GrStencilAndCoverTextContext.cpp index ebf735a55e..4d77b0e1a2 100644 --- a/src/gpu/text/GrStencilAndCoverTextContext.cpp +++ b/src/gpu/text/GrStencilAndCoverTextContext.cpp @@ -11,7 +11,6 @@ #include "GrDrawContext.h" #include "GrPath.h" #include "GrPathRange.h" -#include "GrPipelineBuilder.h" #include "GrResourceProvider.h" #include "GrTextUtils.h" #include "SkAutoKern.h" @@ -643,11 +642,8 @@ void GrStencilAndCoverTextContext::TextRun::draw(GrContext* ctx, GrPathRendering::kWinding_FillType, glyphs, fInstanceData, bounds)); - GrPipelineBuilder pipelineBuilder(grPaint); - pipelineBuilder.setState(GrPipelineBuilder::kHWAntialias_Flag, grPaint.isAntiAlias()); - pipelineBuilder.setUserStencil(&kCoverPass); - - drawContext->drawBatch(pipelineBuilder, clip, batch); + SkASSERT(drawContext->mustUseHWAA(grPaint) == grPaint.isAntiAlias()); + drawContext->drawBatch(grPaint, clip, kCoverPass, batch); } if (fFallbackTextBlob) { |