diff options
author | 2016-12-09 14:06:38 -0500 | |
---|---|---|
committer | 2016-12-09 19:56:24 +0000 | |
commit | 3944484020d98ff8f386378296106c321279482b (patch) | |
tree | a77a4a189b715cc544656929d3d3d71be3aca622 /src/effects/SkBlurMaskFilter.cpp | |
parent | d263413a2a92cafe3fd3b051c67d00206c9a0e4d (diff) |
Reland "Remove antialiasing control from GrPaint."
This contains fixes for GLPrograms test and mixed samples rendering.
This reverts commit 419d81eed4a010e6080db199795117cbedf9e6e4.
BUG=skia:
Change-Id: If8f002fbfaaaab6d1607403f2b15ccc7f1e17e87
Reviewed-on: https://skia-review.googlesource.com/5763
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'src/effects/SkBlurMaskFilter.cpp')
-rw-r--r-- | src/effects/SkBlurMaskFilter.cpp | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/src/effects/SkBlurMaskFilter.cpp b/src/effects/SkBlurMaskFilter.cpp index e8867ead76..0b1d1db6fb 100644 --- a/src/effects/SkBlurMaskFilter.cpp +++ b/src/effects/SkBlurMaskFilter.cpp @@ -1060,7 +1060,8 @@ bool SkBlurMaskFilterImpl::directFilterMaskGPU(GrTextureProvider* texProvider, return false; } - renderTargetContext->fillRectWithLocalMatrix(clip, *grp, SkMatrix::I(), rect, inverse); + renderTargetContext->fillRectWithLocalMatrix(clip, *grp, GrAA::kNo, SkMatrix::I(), rect, + inverse); return true; } @@ -1103,8 +1104,7 @@ private: static sk_sp<GrTexture> find_or_create_rrect_blur_mask(GrContext* context, const SkRRect& rrectToDraw, const SkISize& size, - float xformedSigma, - bool doAA) { + float xformedSigma) { static const GrUniqueKey::Domain kDomain = GrUniqueKey::GenerateDomain(); GrUniqueKey key; GrUniqueKey::Builder builder(&key, kDomain, 9); @@ -1129,10 +1129,10 @@ static sk_sp<GrTexture> find_or_create_rrect_blur_mask(GrContext* context, } GrPaint grPaint; - grPaint.setAntiAlias(doAA); rtc->clear(nullptr, 0x0, true); - rtc->drawRRect(GrNoClip(), grPaint, SkMatrix::I(), rrectToDraw, GrStyle::SimpleFill()); + rtc->drawRRect(GrNoClip(), grPaint, GrAA::kYes, SkMatrix::I(), rrectToDraw, + GrStyle::SimpleFill()); sk_sp<GrTexture> srcTexture(rtc->asTexture()); if (!srcTexture) { @@ -1192,8 +1192,7 @@ sk_sp<GrFragmentProcessor> GrRRectBlurEffect::Make(GrContext* context, return nullptr; } - sk_sp<GrTexture> mask(find_or_create_rrect_blur_mask(context, rrectToDraw, size, - xformedSigma, true)); + sk_sp<GrTexture> mask(find_or_create_rrect_blur_mask(context, rrectToDraw, size, xformedSigma)); if (!mask) { return nullptr; } @@ -1380,12 +1379,11 @@ bool SkBlurMaskFilterImpl::directFilterRRectMaskGPU(GrContext* context, GrPaint newPaint(*grp); newPaint.addCoverageFragmentProcessor(std::move(fp)); - newPaint.setAntiAlias(false); SkRect srcProxyRect = srcRRect.rect(); srcProxyRect.outset(3.0f*fSigma, 3.0f*fSigma); - renderTargetContext->drawRect(clip, newPaint, viewMatrix, srcProxyRect); + renderTargetContext->drawRect(clip, newPaint, GrAA::kNo, viewMatrix, srcProxyRect); return true; } @@ -1397,7 +1395,6 @@ bool SkBlurMaskFilterImpl::directFilterRRectMaskGPU(GrContext* context, GrPaint newPaint(*grp); newPaint.addCoverageFragmentProcessor(std::move(fp)); - newPaint.setAntiAlias(false); if (!this->ignoreXform()) { SkRect srcProxyRect = srcRRect.rect(); @@ -1444,8 +1441,8 @@ bool SkBlurMaskFilterImpl::directFilterRRectMaskGPU(GrContext* context, proxyRect.outset(extra, extra); - renderTargetContext->fillRectWithLocalMatrix(clip, newPaint, SkMatrix::I(), proxyRect, - inverse); + renderTargetContext->fillRectWithLocalMatrix(clip, newPaint, GrAA::kNo, SkMatrix::I(), + proxyRect, inverse); } return true; @@ -1538,7 +1535,8 @@ bool SkBlurMaskFilterImpl::filterMaskGPU(GrTexture* src, paint.setCoverageSetOpXPFactory(SkRegion::kReplace_Op); } - renderTargetContext->drawRect(GrNoClip(), paint, SkMatrix::I(), SkRect::Make(clipRect)); + renderTargetContext->drawRect(GrNoClip(), paint, GrAA::kNo, SkMatrix::I(), + SkRect::Make(clipRect)); } *result = renderTargetContext->asTexture().release(); |