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

Image filters: fix the zero-sigma fast path in SkBlurImageFilter.

Browse Source 
The fast path was not correctly taking the input srcOffset into account.

BUG=595324
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1807673005

Review URL: https://codereview.chromium.org/1807673005
This commit is contained in:
senorblanco 2016-03-16 16:15:53 -07:00 committed by Commit bot
parent 2732e186a1
commit bf680c30a2
2 changed files with 59 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/effects/SkBlurImageFilter.cpp
View File

@ -104,7 +104,7 @@ bool SkBlurImageFilter::onFilterImageDeprecated(Proxy* proxy,
}
if (kernelSizeX == 0 && kernelSizeY == 0) {
src.extractSubset(dst, srcBounds);
src.extractSubset(dst, srcBounds.makeOffset(-srcOffset.x(), -srcOffset.y()));
offset->fX = srcBounds.x();
offset->fY = srcBounds.y();
return true;
@ -218,7 +218,7 @@ bool SkBlurImageFilter::filterImageGPUDeprecated(Proxy* proxy, const SkBitmap& s
}
SkVector sigma = map_sigma(fSigma, ctx.ctm());
if (sigma.x() == 0 && sigma.y() == 0) {
input.extractSubset(result, srcBounds);
input.extractSubset(result, srcBounds.makeOffset(-srcOffset.x(), -srcOffset.y()));
offset->fX = srcBounds.x();
offset->fY = srcBounds.y();
return true;

64
tests/ImageFilterTest.cpp
View File

@ -158,23 +158,27 @@ static SkImageFilter* make_blue(SkImageFilter* input, const SkImageFilter::CropR
return SkColorFilterImageFilter::Create(filter, input, cropRect);
}
static SkSpecialImage* create_empty_special_image(GrContext* context,
SkImageFilter::Proxy* proxy,
int widthHeight) {
SkAutoTUnref<SkSpecialSurface> surf;
static SkSpecialSurface* create_empty_special_surface(GrContext* context,
SkImageFilter::Proxy* proxy,
int widthHeight) {
if (context) {
GrSurfaceDesc desc;
desc.fConfig = kSkia8888_GrPixelConfig;
desc.fFlags = kRenderTarget_GrSurfaceFlag;
desc.fWidth = widthHeight;
desc.fHeight = widthHeight;
surf.reset(SkSpecialSurface::NewRenderTarget(proxy, context, desc));
return SkSpecialSurface::NewRenderTarget(proxy, context, desc);
} else {
const SkImageInfo info = SkImageInfo::MakeN32(widthHeight, widthHeight,
kOpaque_SkAlphaType);
surf.reset(SkSpecialSurface::NewRaster(proxy, info));
return SkSpecialSurface::NewRaster(proxy, info);
}
}
static SkSpecialImage* create_empty_special_image(GrContext* context,
SkImageFilter::Proxy* proxy,
int widthHeight) {
SkAutoTUnref<SkSpecialSurface> surf(create_empty_special_surface(context, proxy, widthHeight));
SkASSERT(surf);
@ -508,6 +512,52 @@ DEF_GPUTEST_FOR_NATIVE_CONTEXT(TestNegativeBlurSigma_Gpu, reporter, context) {
}
#endif
static void test_zero_blur_sigma(SkImageFilter::Proxy* proxy,
skiatest::Reporter* reporter,
GrContext* context) {
// Check that SkBlurImageFilter with a zero sigma and a non-zero srcOffset works correctly.
SkImageFilter::CropRect cropRect(SkRect::Make(SkIRect::MakeXYWH(5, 0, 5, 10)));
SkAutoTUnref<SkImageFilter> input(SkOffsetImageFilter::Create(0, 0, nullptr, &cropRect));
SkAutoTUnref<SkImageFilter> filter(SkBlurImageFilter::Create(0, 0, input, &cropRect));
SkAutoTUnref<SkSpecialSurface> surf(create_empty_special_surface(context, proxy, 10));
surf->getCanvas()->clear(SK_ColorGREEN);
SkAutoTUnref<SkSpecialImage> image(surf->newImageSnapshot());
SkIPoint offset;
SkImageFilter::Context ctx(SkMatrix::I(), SkIRect::MakeWH(32, 32), nullptr);
SkAutoTUnref<SkSpecialImage> result(filter->filterImage(image, ctx, &offset));
REPORTER_ASSERT(reporter, offset.fX == 5 && offset.fY == 0);
REPORTER_ASSERT(reporter, result);
REPORTER_ASSERT(reporter, result->width() == 5 && result->height() == 10);
SkBitmap resultBM;
TestingSpecialImageAccess::GetROPixels(result, &resultBM);
SkAutoLockPixels lock(resultBM);
for (int y = 0; y < resultBM.height(); y++) {
for (int x = 0; x < resultBM.width(); x++) {
bool diff = *resultBM.getAddr32(x, y) != SK_ColorGREEN;
REPORTER_ASSERT(reporter, !diff);
if (diff) {
break;
}
}
}
}
DEF_TEST(TestZeroBlurSigma, reporter) {
run_raster_test(reporter, 100, test_zero_blur_sigma);
}
#if SK_SUPPORT_GPU
DEF_GPUTEST_FOR_NATIVE_CONTEXT(TestZeroBlurSigma_Gpu, reporter, context) {
run_gpu_test(reporter, context, 100, test_zero_blur_sigma);
}
#endif
DEF_TEST(ImageFilterDrawTiled, reporter) {
// Check that all filters when drawn tiled (with subsequent clip rects) exactly
// match the same filters drawn with a single full-canvas bitmap draw.