diff options
author | robertphillips <robertphillips@google.com> | 2016-05-11 12:41:35 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-05-11 12:41:35 -0700 |
commit | f8237781d28bad38522b3b351688a2f7ee5e0caa (patch) | |
tree | 6d8326dec5ab71f59b68fd7d6f073520d4a1c69c /src | |
parent | 6296da736fbf40aae881650c239420f64e576c3f (diff) |
Revert of Make SkGpuBlurUtils::GaussianBlur more drawContext centric (patchset #2 id:20001 of https://codereview.chromium.org/1962903003/ )
Reason for revert:
ASAN
Original issue's description:
> Make SkGpuBlurUtils::GaussianBlur more drawContext centric
>
> This is split out of https://codereview.chromium.org/1959493002/ (Retract GrRenderTarget from SkGpuBlurUtils)
>
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1962903003
>
> Committed: https://skia.googlesource.com/skia/+/e7ef01dcfda0f8ae407ba92cc03cf3f7841ec470
>
> Committed: https://skia.googlesource.com/skia/+/d38d92f9ca6a58ee51461488f0869343cf7ca083
TBR=bsalomon@google.com,scroggo@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review-Url: https://codereview.chromium.org/1964413003
Diffstat (limited to 'src')
-rw-r--r-- | src/effects/SkBlurImageFilter.cpp | 19 | ||||
-rw-r--r-- | src/effects/SkBlurMaskFilter.cpp | 16 | ||||
-rw-r--r-- | src/effects/SkGpuBlurUtils.cpp | 130 | ||||
-rw-r--r-- | src/effects/SkGpuBlurUtils.h | 30 |
4 files changed, 123 insertions, 72 deletions
diff --git a/src/effects/SkBlurImageFilter.cpp b/src/effects/SkBlurImageFilter.cpp index 0625d37a42..4e1fde250b 100644 --- a/src/effects/SkBlurImageFilter.cpp +++ b/src/effects/SkBlurImageFilter.cpp @@ -121,21 +121,20 @@ sk_sp<SkSpecialImage> SkBlurImageFilter::onFilterImage(SkSpecialImage* source, inputBounds.offset(-inputOffset); dstBounds.offset(-inputOffset); SkRect inputBoundsF(SkRect::Make(inputBounds)); - sk_sp<GrDrawContext> drawContext(SkGpuBlurUtils::GaussianBlur( - context, - inputTexture.get(), - source->props().isGammaCorrect(), - SkRect::Make(dstBounds), - &inputBoundsF, - sigma.x(), - sigma.y())); - if (!drawContext) { + sk_sp<GrTexture> tex(SkGpuBlurUtils::GaussianBlur(context, + inputTexture.get(), + source->props().isGammaCorrect(), + SkRect::Make(dstBounds), + &inputBoundsF, + sigma.x(), + sigma.y())); + if (!tex) { return nullptr; } return SkSpecialImage::MakeFromGpu(SkIRect::MakeWH(dstBounds.width(), dstBounds.height()), kNeedNewImageUniqueID_SpecialImage, - drawContext->asTexture(), &source->props()); + std::move(tex), &source->props()); } #endif diff --git a/src/effects/SkBlurMaskFilter.cpp b/src/effects/SkBlurMaskFilter.cpp index a2d67d74af..37d6c960d7 100644 --- a/src/effects/SkBlurMaskFilter.cpp +++ b/src/effects/SkBlurMaskFilter.cpp @@ -1248,11 +1248,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. bool isNormalBlur = (kNormal_SkBlurStyle == fBlurStyle); - sk_sp<GrDrawContext> drawContext(SkGpuBlurUtils::GaussianBlur(context, src, - isNormalBlur && canOverwriteSrc, - clipRect, nullptr, - xformedSigma, xformedSigma)); - if (!drawContext) { + *result = SkGpuBlurUtils::GaussianBlur(context, src, isNormalBlur && canOverwriteSrc, + clipRect, nullptr, + xformedSigma, xformedSigma); + if (nullptr == *result) { return false; } @@ -1277,10 +1276,15 @@ bool SkBlurMaskFilterImpl::filterMaskGPU(GrTexture* src, paint.setCoverageSetOpXPFactory(SkRegion::kReplace_Op); } + sk_sp<GrDrawContext> 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 c718068165..1cb2d1dd12 100644 --- a/src/effects/SkGpuBlurUtils.cpp +++ b/src/effects/SkGpuBlurUtils.cpp @@ -163,13 +163,13 @@ static void convolve_gaussian(GrDrawContext* drawContext, } } -sk_sp<GrDrawContext> GaussianBlur(GrContext* context, - GrTexture* srcTexture, - bool gammaCorrect, - const SkRect& dstBounds, - const SkRect* srcBounds, - float sigmaX, - float sigmaY) { +GrTexture* 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,14 +211,6 @@ sk_sp<GrDrawContext> GaussianBlur(GrContext* context, const SkSurfaceProps props(gammaCorrect ? SkSurfaceProps::kGammaCorrect_Flag : 0, SkSurfaceProps::kLegacyFontHost_InitType); - sk_sp<GrDrawContext> 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 && @@ -226,17 +218,35 @@ sk_sp<GrDrawContext> GaussianBlur(GrContext* context, // We shouldn't be scaling because this is a small size blur SkASSERT((1 == scaleFactorX) && (1 == scaleFactorY)); + sk_sp<GrDrawContext> 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; + return dstDrawContext->asTexture().release(); } - sk_sp<GrDrawContext> tmpDrawContext(context->newDrawContext(SkBackingFit::kApprox, - width, height, config, - 0, kDefault_GrSurfaceOrigin, - &props)); - if (!tmpDrawContext) { + GrSurfaceDesc desc; + desc.fFlags = kRenderTarget_GrSurfaceFlag; + desc.fWidth = width; + desc.fHeight = height; + desc.fConfig = config; + + GrTexture* dstTexture; + GrTexture* tempTexture; + SkAutoTUnref<GrTexture> temp1, temp2; + + temp1.reset(context->textureProvider()->createApproxTexture(desc)); + dstTexture = temp1.get(); + temp2.reset(context->textureProvider()->createApproxTexture(desc)); + tempTexture = temp2.get(); + + if (!dstTexture || !tempTexture) { return nullptr; } @@ -270,12 +280,17 @@ sk_sp<GrDrawContext> GaussianBlur(GrContext* context, scale_rect(&dstRect, i < scaleFactorX ? 0.5f : 1.0f, i < scaleFactorY ? 0.5f : 1.0f); + sk_sp<GrDrawContext> dstDrawContext( + context->drawContext(sk_ref_sp(dstTexture->asRenderTarget()))); + if (!dstDrawContext) { + return nullptr; + } dstDrawContext->fillRectToRect(clip, paint, SkMatrix::I(), dstRect, srcRect); - srcDrawContext = dstDrawContext; + srcDrawContext.swap(dstDrawContext); srcRect = dstRect; - srcTexture = srcDrawContext->asTexture().release(); - SkTSwap(dstDrawContext, tmpDrawContext); + srcTexture = dstTexture; + SkTSwap(dstTexture, tempTexture); localSrcBounds = srcRect; } @@ -286,7 +301,13 @@ sk_sp<GrDrawContext> GaussianBlur(GrContext* context, SkIRect srcIRect = srcRect.roundOut(); if (sigmaX > 0.0f) { if (scaleFactorX > 1) { - SkASSERT(srcDrawContext); + // 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; + } + } // Clear out a radius to the right of the srcRect to prevent the // X convolution from reading garbage. @@ -295,20 +316,31 @@ sk_sp<GrDrawContext> GaussianBlur(GrContext* context, srcDrawContext->clear(&clearRect, 0x0, false); } + sk_sp<GrDrawContext> 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 = dstDrawContext; - srcTexture = srcDrawContext->asTexture().release(); + srcDrawContext.swap(dstDrawContext); + srcTexture = dstTexture; srcRect.offsetTo(0, 0); - SkTSwap(dstDrawContext, tmpDrawContext); + SkTSwap(dstTexture, tempTexture); localSrcBounds = srcRect; srcOffset.set(0, 0); } if (sigmaY > 0.0f) { if (scaleFactorY > 1 || sigmaX > 0.0f) { - SkASSERT(srcDrawContext); + // 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; + } + } // Clear out a radius below the srcRect to prevent the Y // convolution from reading garbage. @@ -317,47 +349,61 @@ sk_sp<GrDrawContext> GaussianBlur(GrContext* context, srcDrawContext->clear(&clearRect, 0x0, false); } + sk_sp<GrDrawContext> 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 = dstDrawContext; + srcDrawContext.swap(dstDrawContext); + srcTexture = dstTexture; srcRect.offsetTo(0, 0); - SkTSwap(dstDrawContext, tmpDrawContext); + SkTSwap(dstTexture, tempTexture); } - SkASSERT(srcDrawContext); - srcTexture = nullptr; // we don't use this from here on out srcIRect = srcRect.roundOut(); if (scaleFactorX > 1 || scaleFactorY > 1) { - // Clear one pixel to the right and below, to accommodate bilinear upsampling. - clearRect = SkIRect::MakeXYWH(srcIRect.fLeft, srcIRect.fBottom, srcIRect.width() + 1, 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()); + clearRect = SkIRect::MakeXYWH(srcIRect.fRight, srcIRect.fTop, + 1, srcIRect.height()); srcDrawContext->clear(&clearRect, 0x0, false); - SkMatrix matrix; - matrix.setIDiv(srcDrawContext->width(), srcDrawContext->height()); + matrix.setIDiv(srcTexture->width(), srcTexture->height()); GrPaint paint; paint.setGammaCorrect(gammaCorrect); // FIXME: this should be mitchell, not bilinear. GrTextureParams params(SkShader::kClamp_TileMode, GrTextureParams::kBilerp_FilterMode); - paint.addColorTextureProcessor(srcDrawContext->asTexture().release(), matrix, params); + paint.addColorTextureProcessor(srcTexture, matrix, params); paint.setPorterDuffXPFactory(SkXfermode::kSrc_Mode); SkRect dstRect(srcRect); scale_rect(&dstRect, (float) scaleFactorX, (float) scaleFactorY); + sk_sp<GrDrawContext> dstDrawContext( + context->drawContext(sk_ref_sp(dstTexture->asRenderTarget()))); + if (!dstDrawContext) { + return nullptr; + } dstDrawContext->fillRectToRect(clip, paint, SkMatrix::I(), dstRect, srcRect); - srcDrawContext = dstDrawContext; + srcDrawContext.swap(dstDrawContext); srcRect = dstRect; - SkTSwap(dstDrawContext, tmpDrawContext); + srcTexture = dstTexture; + SkTSwap(dstTexture, tempTexture); } - return srcDrawContext; + return SkRef(srcTexture); } #endif diff --git a/src/effects/SkGpuBlurUtils.h b/src/effects/SkGpuBlurUtils.h index 0d37f158be..8bc4377f59 100644 --- a/src/effects/SkGpuBlurUtils.h +++ b/src/effects/SkGpuBlurUtils.h @@ -9,18 +9,19 @@ #define SkGpuBlurUtils_DEFINED #if SK_SUPPORT_GPU -#include "GrDrawContext.h" +#include "GrTextureProvider.h" -class GrContext; class GrTexture; +class GrContext; +#endif struct SkRect; namespace SkGpuBlurUtils { + +#if SK_SUPPORT_GPU /** - * 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! + * Applies a 2D Gaussian blur to a given texture. * @param context The GPU context * @param srcTexture The source texture to be blurred. * @param gammaCorrect Should blur be gamma-correct (sRGB to linear, etc...) @@ -29,17 +30,18 @@ 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 drawContext containing the blurred result. + * @return the blurred texture, which may be srcTexture reffed, or a + * new texture. It is the caller's responsibility to unref this texture. */ - sk_sp<GrDrawContext> GaussianBlur(GrContext* context, - GrTexture* srcTexture, - bool gammaCorrect, - const SkRect& dstBounds, - const SkRect* srcBounds, - float sigmaX, - float sigmaY); + GrTexture* GaussianBlur(GrContext* context, + GrTexture* srcTexture, + bool gammaCorrect, + const SkRect& dstBounds, + const SkRect* srcBounds, + float sigmaX, + float sigmaY); +#endif }; #endif -#endif |