From 5dac9b3b5bf7e9c06c207cb92e257535c7d9ec95 Mon Sep 17 00:00:00 2001 From: Brian Salomon Date: Sat, 8 Apr 2017 02:53:30 +0000 Subject: Revert "Create GrXferProcessor while doing GrProcessorSet analysis." This reverts commit 0ae0e23696f2ef08503040f8c02765eb58b26ddf. Reason for revert: static assert failure on ios build Original change's description: > Create GrXferProcessor while doing GrProcessorSet analysis. > > > Bug: skia: > Change-Id: I62a628f9c0536ffb05c8f9d0c9ded5657f93b48e > Reviewed-on: https://skia-review.googlesource.com/11482 > Reviewed-by: Greg Daniel > Commit-Queue: Brian Salomon > TBR=egdaniel@google.com,bsalomon@google.com,reviews@skia.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Change-Id: Ifd57367b0326dd2b53c622705a868e246645d589 Reviewed-on: https://skia-review.googlesource.com/12104 Reviewed-by: Brian Salomon Commit-Queue: Brian Salomon --- src/gpu/text/GrStencilAndCoverTextContext.cpp | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'src/gpu/text/GrStencilAndCoverTextContext.cpp') diff --git a/src/gpu/text/GrStencilAndCoverTextContext.cpp b/src/gpu/text/GrStencilAndCoverTextContext.cpp index 0ae4023b1c..e572e5d633 100644 --- a/src/gpu/text/GrStencilAndCoverTextContext.cpp +++ b/src/gpu/text/GrStencilAndCoverTextContext.cpp @@ -570,7 +570,9 @@ void GrStencilAndCoverTextContext::TextRun::draw(GrContext* ctx, SkScalar y, const SkIRect& clipBounds, GrAtlasTextContext* fallbackTextContext, const SkPaint& originalSkPaint) const { + GrAA runAA = this->isAntiAlias(); SkASSERT(fInstanceData); + SkASSERT(renderTargetContext->isStencilBufferMultisampled() || GrAA::kNo == runAA); if (fInstanceData->count()) { static constexpr GrUserStencilSettings kCoverPass( @@ -604,18 +606,9 @@ 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; - } - std::unique_ptr op = GrDrawPathRangeOp::Make( viewMatrix, fTextRatio, fTextInverseRatio * x, fTextInverseRatio * y, - std::move(grPaint), GrPathRendering::kWinding_FillType, aaType, glyphs.get(), + std::move(grPaint), GrPathRendering::kWinding_FillType, runAA, glyphs.get(), fInstanceData.get(), bounds); renderTargetContext->addDrawOp(clip, std::move(op)); -- cgit v1.2.3