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 /include/gpu | |
| 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 'include/gpu')
| -rw-r--r-- | include/gpu/GrDrawContext.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/include/gpu/GrDrawContext.h b/include/gpu/GrDrawContext.h index 1a7580ea03..bf9a2fd476 100644 --- a/include/gpu/GrDrawContext.h +++ b/include/gpu/GrDrawContext.h @@ -44,6 +44,7 @@ struct SkRect; class SkRRect; struct SkRSXform; class SkTextBlob; +struct GrUserStencilSettings; /* * A helper object to orchestrate draws @@ -260,7 +261,8 @@ public: bool hasMixedSamples() const { return fRenderTarget->hasMixedSamples(); } bool mustUseHWAA(const GrPaint& paint) const { - return paint.isAntiAlias() && fRenderTarget->isUnifiedMultisampled(); + return paint.isAntiAlias() && + (fRenderTarget->isUnifiedMultisampled() || fRenderTarget->hasMixedSamples()); } const GrSurfaceDesc& desc() const { return fRenderTarget->desc(); } @@ -345,7 +347,8 @@ private: // This entry point allows the GrTextContext-derived classes to add their batches to // the drawTarget. - void drawBatch(const GrPipelineBuilder& pipelineBuilder, const GrClip&, GrDrawBatch* batch); + void drawBatch(const GrPaint&, const GrClip&, const GrUserStencilSettings&, GrDrawBatch* batch, + GrDrawFace = GrDrawFace::kBoth); GrDrawTarget* getDrawTarget(); |