From eae84c2e0e2126374cd488a1c8a3e18169145635 Mon Sep 17 00:00:00 2001 From: senorblanco Date: Tue, 26 Jan 2016 08:41:02 -0800 Subject: Image filters: fix srcOffset handling in asFragmentProcessor() path. Filters such as SkMatrixConvolutionImageFilter which use the asFragmentProcessor() path were not correctly handling srcOffset. It is correctly applied to the bounds, but the srcRect and dstRect were computed from the pre-offset bounds. The fix is to move them to just above where they're used in drawing. Note: this change adds a new test case to the imagefiltersgraph GM, so it will have to be rebaselined post-landing. BUG=skia:4855 GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1637443003 Review URL: https://codereview.chromium.org/1637443003 --- gm/imagefiltersgraph.cpp | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) (limited to 'gm/imagefiltersgraph.cpp') diff --git a/gm/imagefiltersgraph.cpp b/gm/imagefiltersgraph.cpp index 14752dbab5..e783789124 100644 --- a/gm/imagefiltersgraph.cpp +++ b/gm/imagefiltersgraph.cpp @@ -15,6 +15,7 @@ #include "SkColorMatrixFilter.h" #include "SkImage.h" #include "SkImageSource.h" +#include "SkMatrixConvolutionImageFilter.h" #include "SkReadBuffer.h" #include "SkWriteBuffer.h" #include "SkMergeImageFilter.h" @@ -107,7 +108,7 @@ protected: return SkString("imagefiltersgraph"); } - SkISize onISize() override { return SkISize::Make(500, 150); } + SkISize onISize() override { return SkISize::Make(600, 150); } void onOnceBeforeDraw() override { fImage.reset(SkImage::NewFromBitmap( @@ -181,6 +182,40 @@ protected: DrawClippedImage(canvas, fImage, paint); canvas->translate(SkIntToScalar(100), 0); } + { + // Dilate -> matrix convolution. + // This tests that a filter using asFragmentProcessor (matrix + // convolution) correctly handles a non-zero source offset + // (supplied by the dilate). + SkAutoTUnref dilate(SkDilateImageFilter::Create(5, 5)); + + SkAutoTUnref mode(SkXfermode::Create(SkXfermode::kSrcIn_Mode)); + + SkScalar kernel[9] = { + SkIntToScalar(-1), SkIntToScalar( -1 ), SkIntToScalar(-1), + SkIntToScalar(-1), SkIntToScalar( 7 ), SkIntToScalar(-1), + SkIntToScalar(-1), SkIntToScalar( -1 ), SkIntToScalar(-1), + }; + SkISize kernelSize = SkISize::Make(3, 3); + SkScalar gain = 1.0f, bias = SkIntToScalar(0); + SkIPoint kernelOffset = SkIPoint::Make(1, 1); + auto tileMode = SkMatrixConvolutionImageFilter::kClamp_TileMode; + bool convolveAlpha = false; + SkAutoTUnref convolve( + SkMatrixConvolutionImageFilter::Create(kernelSize, + kernel, + gain, + bias, + kernelOffset, + tileMode, + convolveAlpha, + dilate)); + + SkPaint paint; + paint.setImageFilter(convolve); + DrawClippedImage(canvas, fImage, paint); + canvas->translate(SkIntToScalar(100), 0); + } { // Test that crop offsets are absolute, not relative to the parent's crop rect. SkAutoTUnref cf1(SkColorFilter::CreateModeFilter(SK_ColorBLUE, -- cgit v1.2.3