AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix a bug in SkGpuBlurUtils::GaussianBlur (take 2)

Browse Source 
This fixes the remaining imageblurclampmode bug and a preexisting un-reported error in the imageblurrepeatmode GM.

This relies on https://chromium-review.googlesource.com/c/chromium/src/+/1044113 (Add a flag to disable a blur imagefilter bug fix in Skia) landing in Chrome first.

Bug: skia:7765
Change-Id: I568d18c17bb95c9e270e4cfd304c8dc134a48a70
Reviewed-on: https://skia-review.googlesource.com/125961
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
This commit is contained in:
Robert Phillips 2018-05-04 11:10:31 -04:00 committed by Skia Commit-Bot
parent d286aa73f1
commit 72de74504f
1 changed files with 33 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/core/SkGpuBlurUtils.cpp
View File

@ -161,10 +161,11 @@ static sk_sp<GrRenderTargetContext> convolve_gaussian(GrContext* context,
Direction direction,
int radius,
float sigma,
const SkIRect& srcBounds,
SkIRect* contentRect,
GrTextureDomain::Mode mode,
const SkImageInfo& dstII,
SkBackingFit fit) {
SkBackingFit fit,
int radiusY /* temporarary*/) {
SkASSERT(srcRect.width() <= dstII.width() && srcRect.height() <= dstII.height());
GrPixelConfig config = get_blur_config(proxy.get(), dstII.colorSpace());
@ -184,18 +185,19 @@ static sk_sp<GrRenderTargetContext> convolve_gaussian(GrContext* context,
int bounds[2] = { 0, 0 };
SkIRect dstRect = SkIRect::MakeWH(srcRect.width(), srcRect.height());
if (GrTextureDomain::kIgnore_Mode == mode) {
*contentRect = dstRect;
convolve_gaussian_1d(dstRenderTargetContext.get(), clip, dstRect, srcOffset,
std::move(proxy), direction, radius, sigma,
GrTextureDomain::kIgnore_Mode, bounds);
return dstRenderTargetContext;
}
SkIRect midRect = srcBounds, leftRect, rightRect;
SkIRect midRect = *contentRect, leftRect, rightRect;
midRect.offset(srcOffset);
SkIRect topRect, bottomRect;
if (Direction::kX == direction) {
bounds[0] = srcBounds.left();
bounds[1] = srcBounds.right();
bounds[0] = contentRect->left();
bounds[1] = contentRect->right();
topRect = SkIRect::MakeLTRB(0, 0, dstRect.right(), midRect.top());
bottomRect = SkIRect::MakeLTRB(0, midRect.bottom(), dstRect.right(), dstRect.bottom());
midRect.inset(radius, 0);
@ -204,9 +206,22 @@ static sk_sp<GrRenderTargetContext> convolve_gaussian(GrContext* context,
SkIRect::MakeLTRB(midRect.right(), midRect.top(), dstRect.width(), midRect.bottom());
dstRect.fTop = midRect.top();
dstRect.fBottom = midRect.bottom();
#ifdef SK_IGNORE_BLUR_IMAGE_FILTER_FIX
*contentRect = dstRect;
if (GrTextureDomain::kClamp_Mode == mode) {
// We need to adjust bounds because we only fill part of the srcRect in x-pass.
contentRect->inset(0, radiusY);
}
#else
contentRect->fLeft = dstRect.fLeft;
contentRect->fTop = midRect.fTop;
contentRect->fRight = dstRect.fRight;
contentRect->fBottom = midRect.fBottom;
#endif
} else {
bounds[0] = srcBounds.top();
bounds[1] = srcBounds.bottom();
bounds[0] = contentRect->top();
bounds[1] = contentRect->bottom();
topRect = SkIRect::MakeLTRB(0, 0, midRect.left(), dstRect.bottom());
bottomRect = SkIRect::MakeLTRB(midRect.right(), 0, dstRect.right(), dstRect.bottom());
midRect.inset(0, radius);
@ -215,6 +230,13 @@ static sk_sp<GrRenderTargetContext> convolve_gaussian(GrContext* context,
SkIRect::MakeLTRB(midRect.left(), midRect.bottom(), midRect.right(), dstRect.height());
dstRect.fLeft = midRect.left();
dstRect.fRight = midRect.right();
#ifndef SK_IGNORE_BLUR_IMAGE_FILTER_FIX
contentRect->fLeft = midRect.fLeft;
contentRect->fTop = dstRect.fTop;
contentRect->fRight = midRect.fRight;
contentRect->fBottom = dstRect.fBottom;
#endif
}
if (!topRect.isEmpty()) {
dstRenderTargetContext->clear(&topRect, 0, GrRenderTargetContext::CanClearFullscreen::kNo);
@ -488,8 +510,8 @@ sk_sp<GrRenderTargetContext> GaussianBlur(GrContext* context,
scale_irect_roundout(&srcRect, 1.0f / scaleFactorX, 1.0f / scaleFactorY);
if (sigmaX > 0.0f) {
dstRenderTargetContext = convolve_gaussian(context, std::move(srcProxy), srcRect, srcOffset,
Direction::kX, radiusX, sigmaX, localSrcBounds,
mode, finalDestII, xFit);
Direction::kX, radiusX, sigmaX, &localSrcBounds,
mode, finalDestII, xFit, radiusY);
if (!dstRenderTargetContext) {
return nullptr;
}
@ -508,18 +530,13 @@ sk_sp<GrRenderTargetContext> GaussianBlur(GrContext* context,
}
srcRect.offsetTo(0, 0);
localSrcBounds = srcRect;
if (GrTextureDomain::kClamp_Mode == mode) {
// We need to adjust bounds because we only fill part of the srcRect in x-pass.
localSrcBounds.inset(0, radiusY);
}
srcOffset.set(0, 0);
}
if (sigmaY > 0.0f) {
dstRenderTargetContext = convolve_gaussian(context, std::move(srcProxy), srcRect, srcOffset,
Direction::kY, radiusY, sigmaY, localSrcBounds,
mode, finalDestII, yFit);
Direction::kY, radiusY, sigmaY, &localSrcBounds,
mode, finalDestII, yFit, radiusY);
if (!dstRenderTargetContext) {
return nullptr;
}