From a90dcf791b70ee5147faebd1d102f51c455b2889 Mon Sep 17 00:00:00 2001 From: vjiaoblack Date: Mon, 22 Aug 2016 12:04:41 -0700 Subject: Revert of Moving SkBlurImageFilter into core (patchset #8 id:140001 of https://codereview.chromium.org/2255803003/ ) Reason for revert: Misnamed function. Original issue's description: > Moving SkBlurImageFilter into core > > BUG=skia: > GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2255803003 > > Committed: https://skia.googlesource.com/skia/+/dd3259eb95c3b47e11eefa3b176365a112a32b48 > Committed: https://skia.googlesource.com/skia/+/e426babe7552b1cb4e27cdf4e90826feabb9e3b0 > Committed: https://skia.googlesource.com/skia/+/4d760175686df8f61a11b66946eb307d89dd2c75 TBR=reed@google.com,fmalita@chromium.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia: Review-Url: https://codereview.chromium.org/2265263002 --- src/core/SkGpuBlurUtils.cpp | 382 -------------------------------------------- 1 file changed, 382 deletions(-) delete mode 100644 src/core/SkGpuBlurUtils.cpp (limited to 'src/core/SkGpuBlurUtils.cpp') diff --git a/src/core/SkGpuBlurUtils.cpp b/src/core/SkGpuBlurUtils.cpp deleted file mode 100644 index ca762e88e3..0000000000 --- a/src/core/SkGpuBlurUtils.cpp +++ /dev/null @@ -1,382 +0,0 @@ -/* - * Copyright 2013 Google Inc. - * - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ - -#include "SkGpuBlurUtils.h" - -#include "SkRect.h" - -#if SK_SUPPORT_GPU -#include "effects/GrConvolutionEffect.h" -#include "effects/GrMatrixConvolutionEffect.h" -#include "GrContext.h" -#include "GrCaps.h" -#include "GrDrawContext.h" -#include "GrFixedClip.h" - -#define MAX_BLUR_SIGMA 4.0f - -static void scale_irect_roundout(SkIRect* rect, float xScale, float yScale) { - rect->fLeft = SkScalarFloorToInt(SkScalarMul(rect->fLeft, xScale)); - rect->fTop = SkScalarFloorToInt(SkScalarMul(rect->fTop, yScale)); - rect->fRight = SkScalarCeilToInt(SkScalarMul(rect->fRight, xScale)); - rect->fBottom = SkScalarCeilToInt(SkScalarMul(rect->fBottom, yScale)); -} - -static void scale_irect(SkIRect* rect, int xScale, int yScale) { - rect->fLeft *= xScale; - rect->fTop *= yScale; - rect->fRight *= xScale; - rect->fBottom *= yScale; -} - -#ifdef SK_DEBUG -static inline int is_even(int x) { return !(x & 1); } -#endif - -static void shrink_irect_by_2(SkIRect* rect, bool xAxis, bool yAxis) { - if (xAxis) { - SkASSERT(is_even(rect->fLeft) && is_even(rect->fRight)); - rect->fLeft /= 2; - rect->fRight /= 2; - } - if (yAxis) { - SkASSERT(is_even(rect->fTop) && is_even(rect->fBottom)); - rect->fTop /= 2; - rect->fBottom /= 2; - } -} - -static float adjust_sigma(float sigma, int maxTextureSize, int *scaleFactor, int *radius) { - *scaleFactor = 1; - while (sigma > MAX_BLUR_SIGMA) { - *scaleFactor *= 2; - sigma *= 0.5f; - if (*scaleFactor > maxTextureSize) { - *scaleFactor = maxTextureSize; - sigma = MAX_BLUR_SIGMA; - } - } - *radius = static_cast(ceilf(sigma * 3.0f)); - SkASSERT(*radius <= GrConvolutionEffect::kMaxKernelRadius); - return sigma; -} - -static void convolve_gaussian_1d(GrDrawContext* drawContext, - const GrClip& clip, - const SkIRect& dstRect, - const SkIPoint& srcOffset, - GrTexture* texture, - Gr1DKernelEffect::Direction direction, - int radius, - float sigma, - bool useBounds, - float bounds[2]) { - GrPaint paint; - paint.setGammaCorrect(drawContext->isGammaCorrect()); - sk_sp conv(GrConvolutionEffect::MakeGaussian( - texture, direction, radius, sigma, useBounds, bounds)); - paint.addColorFragmentProcessor(std::move(conv)); - paint.setPorterDuffXPFactory(SkXfermode::kSrc_Mode); - SkMatrix localMatrix = SkMatrix::MakeTrans(-SkIntToScalar(srcOffset.x()), - -SkIntToScalar(srcOffset.y())); - drawContext->fillRectWithLocalMatrix(clip, paint, SkMatrix::I(), - SkRect::Make(dstRect), localMatrix); -} - -static void convolve_gaussian_2d(GrDrawContext* drawContext, - const GrClip& clip, - const SkIRect& dstRect, - const SkIPoint& srcOffset, - GrTexture* texture, - int radiusX, - int radiusY, - SkScalar sigmaX, - SkScalar sigmaY, - const SkIRect* srcBounds) { - SkMatrix localMatrix = SkMatrix::MakeTrans(-SkIntToScalar(srcOffset.x()), - -SkIntToScalar(srcOffset.y())); - SkISize size = SkISize::Make(2 * radiusX + 1, 2 * radiusY + 1); - SkIPoint kernelOffset = SkIPoint::Make(radiusX, radiusY); - GrPaint paint; - paint.setGammaCorrect(drawContext->isGammaCorrect()); - SkIRect bounds = srcBounds ? *srcBounds : SkIRect::EmptyIRect(); - - sk_sp conv(GrMatrixConvolutionEffect::MakeGaussian( - texture, bounds, size, 1.0, 0.0, kernelOffset, - srcBounds ? GrTextureDomain::kDecal_Mode : GrTextureDomain::kIgnore_Mode, - true, sigmaX, sigmaY)); - paint.addColorFragmentProcessor(std::move(conv)); - paint.setPorterDuffXPFactory(SkXfermode::kSrc_Mode); - drawContext->fillRectWithLocalMatrix(clip, paint, SkMatrix::I(), - SkRect::Make(dstRect), localMatrix); -} - -static void convolve_gaussian(GrDrawContext* drawContext, - const GrClip& clip, - const SkIRect& srcRect, - GrTexture* texture, - Gr1DKernelEffect::Direction direction, - int radius, - float sigma, - const SkIRect* srcBounds, - const SkIPoint& srcOffset) { - float bounds[2] = { 0.0f, 1.0f }; - SkIRect dstRect = SkIRect::MakeWH(srcRect.width(), srcRect.height()); - if (!srcBounds) { - convolve_gaussian_1d(drawContext, clip, dstRect, srcOffset, texture, - direction, radius, sigma, false, bounds); - return; - } - SkIRect midRect = *srcBounds, leftRect, rightRect; - midRect.offset(srcOffset); - SkIRect topRect, bottomRect; - if (direction == Gr1DKernelEffect::kX_Direction) { - bounds[0] = SkIntToFloat(srcBounds->left()) / texture->width(); - bounds[1] = SkIntToFloat(srcBounds->right()) / texture->width(); - topRect = SkIRect::MakeLTRB(0, 0, dstRect.right(), midRect.top()); - bottomRect = SkIRect::MakeLTRB(0, midRect.bottom(), dstRect.right(), dstRect.bottom()); - midRect.inset(radius, 0); - leftRect = SkIRect::MakeLTRB(0, midRect.top(), midRect.left(), midRect.bottom()); - rightRect = - SkIRect::MakeLTRB(midRect.right(), midRect.top(), dstRect.width(), midRect.bottom()); - dstRect.fTop = midRect.top(); - dstRect.fBottom = midRect.bottom(); - } else { - bounds[0] = SkIntToFloat(srcBounds->top()) / texture->height(); - bounds[1] = SkIntToFloat(srcBounds->bottom()) / texture->height(); - topRect = SkIRect::MakeLTRB(0, 0, midRect.left(), dstRect.bottom()); - bottomRect = SkIRect::MakeLTRB(midRect.right(), 0, dstRect.right(), dstRect.bottom()); - midRect.inset(0, radius); - leftRect = SkIRect::MakeLTRB(midRect.left(), 0, midRect.right(), midRect.top()); - rightRect = - SkIRect::MakeLTRB(midRect.left(), midRect.bottom(), midRect.right(), dstRect.height()); - dstRect.fLeft = midRect.left(); - dstRect.fRight = midRect.right(); - } - if (!topRect.isEmpty()) { - drawContext->clear(&topRect, 0, false); - } - - if (!bottomRect.isEmpty()) { - drawContext->clear(&bottomRect, 0, false); - } - if (midRect.isEmpty()) { - // Blur radius covers srcBounds; use bounds over entire draw - convolve_gaussian_1d(drawContext, clip, dstRect, srcOffset, texture, - direction, radius, sigma, true, bounds); - } else { - // Draw right and left margins with bounds; middle without. - convolve_gaussian_1d(drawContext, clip, leftRect, srcOffset, texture, - direction, radius, sigma, true, bounds); - convolve_gaussian_1d(drawContext, clip, rightRect, srcOffset, texture, - direction, radius, sigma, true, bounds); - convolve_gaussian_1d(drawContext, clip, midRect, srcOffset, texture, - direction, radius, sigma, false, bounds); - } -} - -namespace SkGpuBlurUtils { - -sk_sp GaussianBlur(GrContext* context, - GrTexture* origSrc, - sk_sp colorSpace, - const SkIRect& dstBounds, - const SkIRect* srcBounds, - float sigmaX, - float sigmaY, - SkBackingFit fit) { - SkASSERT(context); - SkIRect clearRect; - int scaleFactorX, radiusX; - int scaleFactorY, radiusY; - int maxTextureSize = context->caps()->maxTextureSize(); - sigmaX = adjust_sigma(sigmaX, maxTextureSize, &scaleFactorX, &radiusX); - sigmaY = adjust_sigma(sigmaY, maxTextureSize, &scaleFactorY, &radiusY); - SkASSERT(sigmaX || sigmaY); - - SkIPoint srcOffset = SkIPoint::Make(-dstBounds.x(), -dstBounds.y()); - SkIRect localDstBounds = SkIRect::MakeWH(dstBounds.width(), dstBounds.height()); - SkIRect localSrcBounds; - SkIRect srcRect; - if (srcBounds) { - srcRect = localSrcBounds = *srcBounds; - srcRect.offset(srcOffset); - srcBounds = &localSrcBounds; - } else { - srcRect = localDstBounds; - } - - scale_irect_roundout(&srcRect, 1.0f / scaleFactorX, 1.0f / scaleFactorY); - scale_irect(&srcRect, scaleFactorX, scaleFactorY); - - // setup new clip - GrFixedClip clip(localDstBounds); - - sk_sp srcTexture(sk_ref_sp(origSrc)); - - SkASSERT(kBGRA_8888_GrPixelConfig == srcTexture->config() || - kRGBA_8888_GrPixelConfig == srcTexture->config() || - kSRGBA_8888_GrPixelConfig == srcTexture->config() || - kSBGRA_8888_GrPixelConfig == srcTexture->config() || - kAlpha_8_GrPixelConfig == srcTexture->config()); - - const int width = dstBounds.width(); - const int height = dstBounds.height(); - const GrPixelConfig config = srcTexture->config(); - - sk_sp dstDrawContext(context->makeDrawContext(fit, - width, height, config, colorSpace, - 0, kDefault_GrSurfaceOrigin)); - 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 && - (2 * radiusX + 1) * (2 * radiusY + 1) <= MAX_KERNEL_SIZE) { - // We shouldn't be scaling because this is a small size blur - SkASSERT((1 == scaleFactorX) && (1 == scaleFactorY)); - - convolve_gaussian_2d(dstDrawContext.get(), clip, localDstBounds, srcOffset, - srcTexture.get(), radiusX, radiusY, sigmaX, sigmaY, srcBounds); - - return dstDrawContext; - } - - sk_sp tmpDrawContext(context->makeDrawContext(fit, - width, height, config, colorSpace, - 0, kDefault_GrSurfaceOrigin)); - if (!tmpDrawContext) { - return nullptr; - } - - sk_sp srcDrawContext; - - SkASSERT(SkIsPow2(scaleFactorX) && SkIsPow2(scaleFactorY)); - - for (int i = 1; i < scaleFactorX || i < scaleFactorY; i *= 2) { - GrPaint paint; - paint.setGammaCorrect(dstDrawContext->isGammaCorrect()); - SkMatrix matrix; - matrix.setIDiv(srcTexture->width(), srcTexture->height()); - SkIRect dstRect(srcRect); - if (srcBounds && i == 1) { - SkRect domain; - matrix.mapRect(&domain, SkRect::Make(*srcBounds)); - domain.inset((i < scaleFactorX) ? SK_ScalarHalf / srcTexture->width() : 0.0f, - (i < scaleFactorY) ? SK_ScalarHalf / srcTexture->height() : 0.0f); - sk_sp fp(GrTextureDomainEffect::Make( - srcTexture.get(), - nullptr, - matrix, - domain, - GrTextureDomain::kDecal_Mode, - GrTextureParams::kBilerp_FilterMode)); - paint.addColorFragmentProcessor(std::move(fp)); - srcRect.offset(-srcOffset); - srcOffset.set(0, 0); - } else { - GrTextureParams params(SkShader::kClamp_TileMode, GrTextureParams::kBilerp_FilterMode); - paint.addColorTextureProcessor(srcTexture.get(), nullptr, matrix, params); - } - paint.setPorterDuffXPFactory(SkXfermode::kSrc_Mode); - shrink_irect_by_2(&dstRect, i < scaleFactorX, i < scaleFactorY); - - dstDrawContext->fillRectToRect(clip, paint, SkMatrix::I(), - SkRect::Make(dstRect), SkRect::Make(srcRect)); - - srcDrawContext = dstDrawContext; - srcRect = dstRect; - srcTexture = srcDrawContext->asTexture(); - dstDrawContext.swap(tmpDrawContext); - localSrcBounds = srcRect; - } - - srcRect = localDstBounds; - scale_irect_roundout(&srcRect, 1.0f / scaleFactorX, 1.0f / scaleFactorY); - if (sigmaX > 0.0f) { - if (scaleFactorX > 1) { - SkASSERT(srcDrawContext); - - // Clear out a radius to the right of the srcRect to prevent the - // X convolution from reading garbage. - clearRect = SkIRect::MakeXYWH(srcRect.fRight, srcRect.fTop, - radiusX, srcRect.height()); - srcDrawContext->clear(&clearRect, 0x0, false); - } - - convolve_gaussian(dstDrawContext.get(), clip, srcRect, - srcTexture.get(), Gr1DKernelEffect::kX_Direction, radiusX, sigmaX, - srcBounds, srcOffset); - srcDrawContext = dstDrawContext; - srcTexture = srcDrawContext->asTexture(); - srcRect.offsetTo(0, 0); - dstDrawContext.swap(tmpDrawContext); - localSrcBounds = srcRect; - srcOffset.set(0, 0); - } - - if (sigmaY > 0.0f) { - if (scaleFactorY > 1 || sigmaX > 0.0f) { - SkASSERT(srcDrawContext); - - // Clear out a radius below the srcRect to prevent the Y - // convolution from reading garbage. - clearRect = SkIRect::MakeXYWH(srcRect.fLeft, srcRect.fBottom, - srcRect.width(), radiusY); - srcDrawContext->clear(&clearRect, 0x0, false); - } - - convolve_gaussian(dstDrawContext.get(), clip, srcRect, - srcTexture.get(), Gr1DKernelEffect::kY_Direction, radiusY, sigmaY, - srcBounds, srcOffset); - - srcDrawContext = dstDrawContext; - srcRect.offsetTo(0, 0); - dstDrawContext.swap(tmpDrawContext); - } - - SkASSERT(srcDrawContext); - srcTexture = nullptr; // we don't use this from here on out - - if (scaleFactorX > 1 || scaleFactorY > 1) { - // Clear one pixel to the right and below, to accommodate bilinear upsampling. - clearRect = SkIRect::MakeXYWH(srcRect.fLeft, srcRect.fBottom, srcRect.width() + 1, 1); - srcDrawContext->clear(&clearRect, 0x0, false); - clearRect = SkIRect::MakeXYWH(srcRect.fRight, srcRect.fTop, 1, srcRect.height()); - srcDrawContext->clear(&clearRect, 0x0, false); - - SkMatrix matrix; - matrix.setIDiv(srcDrawContext->width(), srcDrawContext->height()); - - GrPaint paint; - paint.setGammaCorrect(dstDrawContext->isGammaCorrect()); - // FIXME: this should be mitchell, not bilinear. - GrTextureParams params(SkShader::kClamp_TileMode, GrTextureParams::kBilerp_FilterMode); - sk_sp tex(srcDrawContext->asTexture()); - paint.addColorTextureProcessor(tex.get(), nullptr, matrix, params); - paint.setPorterDuffXPFactory(SkXfermode::kSrc_Mode); - - SkIRect dstRect(srcRect); - scale_irect(&dstRect, scaleFactorX, scaleFactorY); - - dstDrawContext->fillRectToRect(clip, paint, SkMatrix::I(), - SkRect::Make(dstRect), SkRect::Make(srcRect)); - - srcDrawContext = dstDrawContext; - srcRect = dstRect; - dstDrawContext.swap(tmpDrawContext); - } - - return srcDrawContext; -} - -} - -#endif - -- cgit v1.2.3