diff options
| author |  Brian Salomon <bsalomon@google.com> | 2017-05-12 11:36:10 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-05-12 16:32:57 +0000 |
| commit | 7c8460e10135c05a42d0744b84838bbc24398ac2 (patch) | |
| tree | b4cb392726e4d997a47ccb7fa02552bd96698055 /src/gpu/text | |
| parent | 0ff114fe11f9ac6ec869fa128321576764a76167 (diff) | |
Make GrRenderTarget[(Proxy)|(Context)]? advertise a "full scene aa type".
Bug: skia:
Change-Id: I24549604e8305028e34e0022bfef992a8e8c33f7
Reviewed-on: https://skia-review.googlesource.com/16230
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'src/gpu/text')
| -rw-r--r-- | src/gpu/text/GrStencilAndCoverTextContext.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/gpu/text/GrStencilAndCoverTextContext.cpp b/src/gpu/text/GrStencilAndCoverTextContext.cpp index 65889b2c56..d2872d246f 100644 --- a/src/gpu/text/GrStencilAndCoverTextContext.cpp +++ b/src/gpu/text/GrStencilAndCoverTextContext.cpp @@ -604,14 +604,8 @@ void GrStencilAndCoverTextContext::TextRun::draw(GrContext* ctx, renderTargetContext->height()); // The run's "font" overrides the anti-aliasing of the passed in SkPaint! - GrAAType aaType; - if (this->aa() == GrAA::kYes) { - SkASSERT(renderTargetContext->isStencilBufferMultisampled()); - aaType = renderTargetContext->isUnifiedMultisampled() ? GrAAType::kMSAA - : GrAAType::kMixedSamples; - } else { - aaType = GrAAType::kNone; - } + GrAAType aaType = GrChooseAAType(this->aa(), renderTargetContext->fsaaType(), + GrAllowMixedSamples::kYes); std::unique_ptr<GrDrawOp> op = GrDrawPathRangeOp::Make( viewMatrix, fTextRatio, fTextInverseRatio * x, fTextInverseRatio * y, |