diff --git a/src/effects/SkBlurImageFilter.cpp b/src/effects/SkBlurImageFilter.cpp index 4e1fde250b..0625d37a42 100644 --- a/src/effects/SkBlurImageFilter.cpp +++ b/src/effects/SkBlurImageFilter.cpp @@ -121,20 +121,21 @@ sk_sp SkBlurImageFilter::onFilterImage(SkSpecialImage* source, inputBounds.offset(-inputOffset); dstBounds.offset(-inputOffset); SkRect inputBoundsF(SkRect::Make(inputBounds)); - sk_sp tex(SkGpuBlurUtils::GaussianBlur(context, - inputTexture.get(), - source->props().isGammaCorrect(), - SkRect::Make(dstBounds), - &inputBoundsF, - sigma.x(), - sigma.y())); - if (!tex) { + sk_sp drawContext(SkGpuBlurUtils::GaussianBlur( + context, + inputTexture.get(), + source->props().isGammaCorrect(), + SkRect::Make(dstBounds), + &inputBoundsF, + sigma.x(), + sigma.y())); + if (!drawContext) { return nullptr; } return SkSpecialImage::MakeFromGpu(SkIRect::MakeWH(dstBounds.width(), dstBounds.height()), kNeedNewImageUniqueID_SpecialImage, - std::move(tex), &source->props()); + drawContext->asTexture(), &source->props()); } #endif diff --git a/src/effects/SkBlurMaskFilter.cpp b/src/effects/SkBlurMaskFilter.cpp index 37d6c960d7..a2d67d74af 100644 --- a/src/effects/SkBlurMaskFilter.cpp +++ b/src/effects/SkBlurMaskFilter.cpp @@ -1248,10 +1248,11 @@ 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. bool isNormalBlur = (kNormal_SkBlurStyle == fBlurStyle); - *result = SkGpuBlurUtils::GaussianBlur(context, src, isNormalBlur && canOverwriteSrc, - clipRect, nullptr, - xformedSigma, xformedSigma); - if (nullptr == *result) { + sk_sp drawContext(SkGpuBlurUtils::GaussianBlur(context, src, + isNormalBlur && canOverwriteSrc, + clipRect, nullptr, + xformedSigma, xformedSigma)); + if (!drawContext) { return false; } @@ -1276,15 +1277,10 @@ bool SkBlurMaskFilterImpl::filterMaskGPU(GrTexture* src, paint.setCoverageSetOpXPFactory(SkRegion::kReplace_Op); } - sk_sp drawContext( - context->drawContext(sk_ref_sp((*result)->asRenderTarget()))); - if (!drawContext) { - return false; - } - drawContext->drawRect(GrClip::WideOpen(), paint, SkMatrix::I(), clipRect); } + *result = drawContext->asTexture().release(); return true; } diff --git a/src/effects/SkGpuBlurUtils.cpp b/src/effects/SkGpuBlurUtils.cpp index 1cb2d1dd12..c718068165 100644 --- a/src/effects/SkGpuBlurUtils.cpp +++ b/src/effects/SkGpuBlurUtils.cpp @@ -163,13 +163,13 @@ static void convolve_gaussian(GrDrawContext* drawContext, } } -GrTexture* GaussianBlur(GrContext* context, - GrTexture* srcTexture, - bool gammaCorrect, - const SkRect& dstBounds, - const SkRect* srcBounds, - float sigmaX, - float sigmaY) { +sk_sp GaussianBlur(GrContext* context, + GrTexture* srcTexture, + bool gammaCorrect, + const SkRect& dstBounds, + const SkRect* srcBounds, + float sigmaX, + float sigmaY) { SkASSERT(context); SkIRect clearRect; int scaleFactorX, radiusX; @@ -211,6 +211,14 @@ GrTexture* GaussianBlur(GrContext* context, const SkSurfaceProps props(gammaCorrect ? SkSurfaceProps::kGammaCorrect_Flag : 0, SkSurfaceProps::kLegacyFontHost_InitType); + sk_sp dstDrawContext(context->newDrawContext(SkBackingFit::kApprox, + width, height, config, + 0, kDefault_GrSurfaceOrigin, + &props)); + if (!dstDrawContext) { + return nullptr; + } + // For really small blurs (certainly no wider than 5x5 on desktop gpus) it is faster to just // launch a single non separable kernel vs two launches if (sigmaX > 0.0f && sigmaY > 0.0f && @@ -218,35 +226,17 @@ GrTexture* GaussianBlur(GrContext* context, // We shouldn't be scaling because this is a small size blur SkASSERT((1 == scaleFactorX) && (1 == scaleFactorY)); - sk_sp dstDrawContext(context->newDrawContext(SkBackingFit::kApprox, - width, height, config, - 0, kDefault_GrSurfaceOrigin, - &props)); - if (!dstDrawContext) { - return nullptr; - } convolve_gaussian_2d(dstDrawContext.get(), clip, localDstBounds, srcOffset, srcTexture, radiusX, radiusY, sigmaX, sigmaY, srcBounds); - return dstDrawContext->asTexture().release(); + return dstDrawContext; } - GrSurfaceDesc desc; - desc.fFlags = kRenderTarget_GrSurfaceFlag; - desc.fWidth = width; - desc.fHeight = height; - desc.fConfig = config; - - GrTexture* dstTexture; - GrTexture* tempTexture; - SkAutoTUnref temp1, temp2; - - temp1.reset(context->textureProvider()->createApproxTexture(desc)); - dstTexture = temp1.get(); - temp2.reset(context->textureProvider()->createApproxTexture(desc)); - tempTexture = temp2.get(); - - if (!dstTexture || !tempTexture) { + sk_sp tmpDrawContext(context->newDrawContext(SkBackingFit::kApprox, + width, height, config, + 0, kDefault_GrSurfaceOrigin, + &props)); + if (!tmpDrawContext) { return nullptr; } @@ -280,17 +270,12 @@ GrTexture* GaussianBlur(GrContext* context, scale_rect(&dstRect, i < scaleFactorX ? 0.5f : 1.0f, i < scaleFactorY ? 0.5f : 1.0f); - sk_sp dstDrawContext( - context->drawContext(sk_ref_sp(dstTexture->asRenderTarget()))); - if (!dstDrawContext) { - return nullptr; - } dstDrawContext->fillRectToRect(clip, paint, SkMatrix::I(), dstRect, srcRect); - srcDrawContext.swap(dstDrawContext); + srcDrawContext = dstDrawContext; srcRect = dstRect; - srcTexture = dstTexture; - SkTSwap(dstTexture, tempTexture); + srcTexture = srcDrawContext->asTexture().release(); + SkTSwap(dstDrawContext, tmpDrawContext); localSrcBounds = srcRect; } @@ -301,13 +286,7 @@ GrTexture* GaussianBlur(GrContext* context, SkIRect srcIRect = srcRect.roundOut(); if (sigmaX > 0.0f) { if (scaleFactorX > 1) { - // TODO: if we pass in the source draw context we don't need this here - if (!srcDrawContext) { - srcDrawContext = context->drawContext(sk_ref_sp(srcTexture->asRenderTarget())); - if (!srcDrawContext) { - return nullptr; - } - } + SkASSERT(srcDrawContext); // Clear out a radius to the right of the srcRect to prevent the // X convolution from reading garbage. @@ -316,31 +295,20 @@ GrTexture* GaussianBlur(GrContext* context, srcDrawContext->clear(&clearRect, 0x0, false); } - sk_sp dstDrawContext( - context->drawContext(sk_ref_sp(dstTexture->asRenderTarget()), &props)); - if (!dstDrawContext) { - return nullptr; - } convolve_gaussian(dstDrawContext.get(), clip, srcRect, srcTexture, Gr1DKernelEffect::kX_Direction, radiusX, sigmaX, srcBounds, srcOffset); - srcDrawContext.swap(dstDrawContext); - srcTexture = dstTexture; + srcDrawContext = dstDrawContext; + srcTexture = srcDrawContext->asTexture().release(); srcRect.offsetTo(0, 0); - SkTSwap(dstTexture, tempTexture); + SkTSwap(dstDrawContext, tmpDrawContext); localSrcBounds = srcRect; srcOffset.set(0, 0); } if (sigmaY > 0.0f) { if (scaleFactorY > 1 || sigmaX > 0.0f) { - // TODO: if we pass in the source draw context we don't need this here - if (!srcDrawContext) { - srcDrawContext = context->drawContext(sk_ref_sp(srcTexture->asRenderTarget())); - if (!srcDrawContext) { - return nullptr; - } - } + SkASSERT(srcDrawContext); // Clear out a radius below the srcRect to prevent the Y // convolution from reading garbage. @@ -349,61 +317,47 @@ GrTexture* GaussianBlur(GrContext* context, srcDrawContext->clear(&clearRect, 0x0, false); } - sk_sp dstDrawContext( - context->drawContext(sk_ref_sp(dstTexture->asRenderTarget()), &props)); - if (!dstDrawContext) { - return nullptr; - } convolve_gaussian(dstDrawContext.get(), clip, srcRect, srcTexture, Gr1DKernelEffect::kY_Direction, radiusY, sigmaY, srcBounds, srcOffset); - srcDrawContext.swap(dstDrawContext); - srcTexture = dstTexture; + srcDrawContext = dstDrawContext; srcRect.offsetTo(0, 0); - SkTSwap(dstTexture, tempTexture); + SkTSwap(dstDrawContext, tmpDrawContext); } + SkASSERT(srcDrawContext); + srcTexture = nullptr; // we don't use this from here on out srcIRect = srcRect.roundOut(); if (scaleFactorX > 1 || scaleFactorY > 1) { - SkASSERT(srcDrawContext); + // Clear one pixel to the right and below, to accommodate bilinear upsampling. + clearRect = SkIRect::MakeXYWH(srcIRect.fLeft, srcIRect.fBottom, srcIRect.width() + 1, 1); + srcDrawContext->clear(&clearRect, 0x0, false); + clearRect = SkIRect::MakeXYWH(srcIRect.fRight, srcIRect.fTop, 1, srcIRect.height()); + srcDrawContext->clear(&clearRect, 0x0, false); - // Clear one pixel to the right and below, to accommodate bilinear - // upsampling. - clearRect = SkIRect::MakeXYWH(srcIRect.fLeft, srcIRect.fBottom, - srcIRect.width() + 1, 1); - srcDrawContext->clear(&clearRect, 0x0, false); - clearRect = SkIRect::MakeXYWH(srcIRect.fRight, srcIRect.fTop, - 1, srcIRect.height()); - srcDrawContext->clear(&clearRect, 0x0, false); SkMatrix matrix; - matrix.setIDiv(srcTexture->width(), srcTexture->height()); + matrix.setIDiv(srcDrawContext->width(), srcDrawContext->height()); GrPaint paint; paint.setGammaCorrect(gammaCorrect); // FIXME: this should be mitchell, not bilinear. GrTextureParams params(SkShader::kClamp_TileMode, GrTextureParams::kBilerp_FilterMode); - paint.addColorTextureProcessor(srcTexture, matrix, params); + paint.addColorTextureProcessor(srcDrawContext->asTexture().release(), matrix, params); paint.setPorterDuffXPFactory(SkXfermode::kSrc_Mode); SkRect dstRect(srcRect); scale_rect(&dstRect, (float) scaleFactorX, (float) scaleFactorY); - sk_sp dstDrawContext( - context->drawContext(sk_ref_sp(dstTexture->asRenderTarget()))); - if (!dstDrawContext) { - return nullptr; - } dstDrawContext->fillRectToRect(clip, paint, SkMatrix::I(), dstRect, srcRect); - srcDrawContext.swap(dstDrawContext); + srcDrawContext = dstDrawContext; srcRect = dstRect; - srcTexture = dstTexture; - SkTSwap(dstTexture, tempTexture); + SkTSwap(dstDrawContext, tmpDrawContext); } - return SkRef(srcTexture); + return srcDrawContext; } #endif diff --git a/src/effects/SkGpuBlurUtils.h b/src/effects/SkGpuBlurUtils.h index 8bc4377f59..0d37f158be 100644 --- a/src/effects/SkGpuBlurUtils.h +++ b/src/effects/SkGpuBlurUtils.h @@ -9,19 +9,18 @@ #define SkGpuBlurUtils_DEFINED #if SK_SUPPORT_GPU -#include "GrTextureProvider.h" +#include "GrDrawContext.h" -class GrTexture; class GrContext; -#endif +class GrTexture; struct SkRect; namespace SkGpuBlurUtils { - -#if SK_SUPPORT_GPU /** - * Applies a 2D Gaussian blur to a given texture. + * Applies a 2D Gaussian blur to a given texture. The blurred result is returned + * as a drawContext in case the caller wishes to future draw into the result. + * Note: one of sigmaX and sigmaY should be non-zero! * @param context The GPU context * @param srcTexture The source texture to be blurred. * @param gammaCorrect Should blur be gamma-correct (sRGB to linear, etc...) @@ -30,18 +29,17 @@ namespace SkGpuBlurUtils { * no pixels will be sampled outside of this rectangle. * @param sigmaX The blur's standard deviation in X. * @param sigmaY The blur's standard deviation in Y. - * @return the blurred texture, which may be srcTexture reffed, or a - * new texture. It is the caller's responsibility to unref this texture. + * @return The drawContext containing the blurred result. */ - GrTexture* GaussianBlur(GrContext* context, - GrTexture* srcTexture, - bool gammaCorrect, - const SkRect& dstBounds, - const SkRect* srcBounds, - float sigmaX, - float sigmaY); -#endif + sk_sp GaussianBlur(GrContext* context, + GrTexture* srcTexture, + bool gammaCorrect, + const SkRect& dstBounds, + const SkRect* srcBounds, + float sigmaX, + float sigmaY); }; #endif +#endif