diff options
| author |  robertphillips <robertphillips@google.com> | 2016-06-27 11:11:05 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-06-27 11:11:05 -0700 |
| commit | 8bad3acce52a24fb99d3201a0cefa54eacf9ee57 (patch) | |
| tree | c06e8ea3441cdd22f97930baa455a49d8948b0eb /src/effects | |
| parent | db7979a24c4db3a287f435144db7a3276df6ba38 (diff) | |
Fix up flags to SkGpuBlurUtils::GaussianBlur
This fixes a bug introduced in: https://codereview.chromium.org/1961953002/ (Reland of Simplify SkGpuBlurUtils::GaussianBlur method)
Although the 'canOverwriteSrc' flag is/was being used I still believe we're better off re-adding it after the mask-blur refactoring finishes.
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2100873002
Review-Url: https://codereview.chromium.org/2100873002
Diffstat (limited to 'src/effects')
| -rw-r--r-- | src/effects/SkBlurMaskFilter.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/effects/SkBlurMaskFilter.cpp b/src/effects/SkBlurMaskFilter.cpp index 1d277f8d76..6a20d48c75 100644 --- a/src/effects/SkBlurMaskFilter.cpp +++ b/src/effects/SkBlurMaskFilter.cpp @@ -67,8 +67,7 @@ public: bool filterMaskGPU(GrTexture* src, const SkMatrix& ctm, const SkIRect& maskRect, - GrTexture** result, - bool canOverwriteSrc) const override; + GrTexture** result) const override; #endif void computeFastBounds(const SkRect&, SkRect*) const override; @@ -1235,8 +1234,7 @@ bool SkBlurMaskFilterImpl::canFilterMaskGPU(const SkRRect& devRRect, bool SkBlurMaskFilterImpl::filterMaskGPU(GrTexture* src, const SkMatrix& ctm, const SkIRect& maskRect, - GrTexture** result, - bool canOverwriteSrc) const { + GrTexture** result) const { // 'maskRect' isn't snapped to the UL corner but the mask in 'src' is. const SkIRect clipRect = SkIRect::MakeWH(maskRect.width(), maskRect.height()); @@ -1247,9 +1245,10 @@ bool SkBlurMaskFilterImpl::filterMaskGPU(GrTexture* src, // If we're doing a normal blur, we can clobber the pathTexture in the // gaussianBlur. Otherwise, we need to save it for later compositing. + static const bool kIsGammaCorrect = false; bool isNormalBlur = (kNormal_SkBlurStyle == fBlurStyle); sk_sp<GrDrawContext> drawContext(SkGpuBlurUtils::GaussianBlur(context, src, - isNormalBlur && canOverwriteSrc, + kIsGammaCorrect, clipRect, nullptr, xformedSigma, xformedSigma)); if (!drawContext) { |