diff options
| author |  bsalomon <bsalomon@google.com> | 2016-07-22 07:10:19 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-07-22 07:10:20 -0700 |
| commit | bb24383abb724c516e472af4eec68f2c3f17a6d0 (patch) | |
| tree | c5c2225167f7a2441a9a8fef1a53c5a93546cde1 /src/gpu/text/GrAtlasTextBlob.cpp | |
| parent | 396fcdba14a0101ed43dcc3863585bf50c4ed6cc (diff) | |
Revert of Retract PipelineBuilder some more (patchset #9 id:160001 of https://codereview.chromium.org/2092893003/ )
Reason for revert:
skbug.com/5559
Original issue's description:
> 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
>
> Committed: https://skia.googlesource.com/skia/+/2895eeb11a9f0d9c0018d49dd4bc45f6c6fc062c
TBR=robertphillips@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review-Url: https://codereview.chromium.org/2175573004
Diffstat (limited to 'src/gpu/text/GrAtlasTextBlob.cpp')
| -rw-r--r-- | src/gpu/text/GrAtlasTextBlob.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/gpu/text/GrAtlasTextBlob.cpp b/src/gpu/text/GrAtlasTextBlob.cpp index 0bea086869..12f35a38c8 100644 --- a/src/gpu/text/GrAtlasTextBlob.cpp +++ b/src/gpu/text/GrAtlasTextBlob.cpp @@ -10,6 +10,7 @@ #include "GrBlurUtils.h" #include "GrContext.h" #include "GrDrawContext.h" +#include "GrPipelineBuilder.h" #include "GrTextUtils.h" #include "SkColorFilter.h" #include "SkDrawFilter.h" @@ -323,7 +324,9 @@ void GrAtlasTextBlob::flushRun(GrDrawContext* dc, const GrPaint& grPaint, distanceAdjustTable, dc->isGammaCorrect(), cache)); - dc->drawBatch(grPaint, clip, GrUserStencilSettings::kUnused, batch); + GrPipelineBuilder pipelineBuilder(grPaint, dc->mustUseHWAA(grPaint)); + + dc->drawBatch(pipelineBuilder, clip, batch); } } |