2013-07-24 22:19:24 +00:00
|
|
|
/*
|
|
|
|
* Copyright 2013 Google Inc.
|
|
|
|
*
|
|
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
|
|
* found in the LICENSE file.
|
|
|
|
*/
|
|
|
|
|
Fixed issues found by fuzzer
Last week, the fuzzer found a few numerical issue with filters and I had written some fixes for them. Here are the fixes with some unit tests.
For senorblanco : So I figured out what was asserting when we'd get a 0 width "result" in SkBicubicImageFilter::onFilterImage(). Basically, if the "result" SkBitmap object calls SkBitmap::setConfig() with "width" and/or "height" set to 0, then the SkBitmap object will call SkBitmap::reset(), making the SkBitmap object's config invalid. At this point, calling SkBitmap::getAddr32() will assert, even without attempting to dereference the data pointer, because the SkBitmap's config is invalid. If height is valid, but width is 0, then this call to SkBitmap::getAddr32() happens directly in SkBicubicImageFilter::onFilterImage() a few lines lower and asserts right away.
BUG=
R=senorblanco@google.com, senorblanco@chromium.org, bsalomon@google.com
Author: sugoi@chromium.org
Review URL: https://chromiumcodereview.appspot.com/23533042
git-svn-id: http://skia.googlecode.com/svn/trunk@11249 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-09-13 12:40:02 +00:00
|
|
|
#include "SkBitmap.h"
|
|
|
|
#include "SkBitmapDevice.h"
|
2014-01-24 20:56:26 +00:00
|
|
|
#include "SkBlurImageFilter.h"
|
Fixed issues found by fuzzer
Last week, the fuzzer found a few numerical issue with filters and I had written some fixes for them. Here are the fixes with some unit tests.
For senorblanco : So I figured out what was asserting when we'd get a 0 width "result" in SkBicubicImageFilter::onFilterImage(). Basically, if the "result" SkBitmap object calls SkBitmap::setConfig() with "width" and/or "height" set to 0, then the SkBitmap object will call SkBitmap::reset(), making the SkBitmap object's config invalid. At this point, calling SkBitmap::getAddr32() will assert, even without attempting to dereference the data pointer, because the SkBitmap's config is invalid. If height is valid, but width is 0, then this call to SkBitmap::getAddr32() happens directly in SkBicubicImageFilter::onFilterImage() a few lines lower and asserts right away.
BUG=
R=senorblanco@google.com, senorblanco@chromium.org, bsalomon@google.com
Author: sugoi@chromium.org
Review URL: https://chromiumcodereview.appspot.com/23533042
git-svn-id: http://skia.googlecode.com/svn/trunk@11249 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-09-13 12:40:02 +00:00
|
|
|
#include "SkCanvas.h"
|
2013-07-24 22:19:24 +00:00
|
|
|
#include "SkColorFilterImageFilter.h"
|
2014-01-24 20:56:26 +00:00
|
|
|
#include "SkColorMatrixFilter.h"
|
2015-02-13 17:05:47 +00:00
|
|
|
#include "SkComposeImageFilter.h"
|
Make SkImageFilter crop rects relative to the primitive origin, instead of relative to their parent's crop rect. This is required by SVG semantics, and is more sane anyway.
To do this, this patch changes the "offset/loc" parameter in filterImage() / onFilterImage() from an inout-param to an out-param only, so that the calling filter can know how much the input filter wants its result offset (and doesn't include the original primitive position). This offset can then be applied to the current filter's crop rect. (I've renamed the parameter "offset" in all cases to make this clear.) This makes the call sites in SkCanvas/SkGpuDevice responsible for applying the resulting offset to the primitive's position, which is actually a fairly small change.
This change also fixes SkTileImageFilter and SkOffsetImageFilter to correctly handle an input offset, which they weren't before. This required modifying the GM's, since they assumed the broken behaviour.
NOTE: this will require rebaselining the imagefiltersgraph test, since it has a new test case.
NOTE: this will "break" the Blink layout tests css3/filters/effect-reference-subregion-chained-hw.html and css3/filters/effect-reference-subregion-hw.html, but it actually makes them give correct results. It should be suppressed on the skia roll, and I'll rebaseline it.
R=reed@google.com
Review URL: https://codereview.chromium.org/112803004
git-svn-id: http://skia.googlecode.com/svn/trunk@12895 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-03 21:48:22 +00:00
|
|
|
#include "SkDisplacementMapEffect.h"
|
|
|
|
#include "SkDropShadowImageFilter.h"
|
2014-05-30 20:50:56 +00:00
|
|
|
#include "SkFlattenableSerialization.h"
|
2014-04-29 15:20:39 +00:00
|
|
|
#include "SkGradientShader.h"
|
2015-09-15 18:26:13 +00:00
|
|
|
#include "SkImage.h"
|
2015-09-14 20:31:18 +00:00
|
|
|
#include "SkImageSource.h"
|
Fixed issues found by fuzzer
Last week, the fuzzer found a few numerical issue with filters and I had written some fixes for them. Here are the fixes with some unit tests.
For senorblanco : So I figured out what was asserting when we'd get a 0 width "result" in SkBicubicImageFilter::onFilterImage(). Basically, if the "result" SkBitmap object calls SkBitmap::setConfig() with "width" and/or "height" set to 0, then the SkBitmap object will call SkBitmap::reset(), making the SkBitmap object's config invalid. At this point, calling SkBitmap::getAddr32() will assert, even without attempting to dereference the data pointer, because the SkBitmap's config is invalid. If height is valid, but width is 0, then this call to SkBitmap::getAddr32() happens directly in SkBicubicImageFilter::onFilterImage() a few lines lower and asserts right away.
BUG=
R=senorblanco@google.com, senorblanco@chromium.org, bsalomon@google.com
Author: sugoi@chromium.org
Review URL: https://chromiumcodereview.appspot.com/23533042
git-svn-id: http://skia.googlecode.com/svn/trunk@11249 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-09-13 12:40:02 +00:00
|
|
|
#include "SkLightingImageFilter.h"
|
2014-01-24 20:56:26 +00:00
|
|
|
#include "SkMatrixConvolutionImageFilter.h"
|
Make SkImageFilter crop rects relative to the primitive origin, instead of relative to their parent's crop rect. This is required by SVG semantics, and is more sane anyway.
To do this, this patch changes the "offset/loc" parameter in filterImage() / onFilterImage() from an inout-param to an out-param only, so that the calling filter can know how much the input filter wants its result offset (and doesn't include the original primitive position). This offset can then be applied to the current filter's crop rect. (I've renamed the parameter "offset" in all cases to make this clear.) This makes the call sites in SkCanvas/SkGpuDevice responsible for applying the resulting offset to the primitive's position, which is actually a fairly small change.
This change also fixes SkTileImageFilter and SkOffsetImageFilter to correctly handle an input offset, which they weren't before. This required modifying the GM's, since they assumed the broken behaviour.
NOTE: this will require rebaselining the imagefiltersgraph test, since it has a new test case.
NOTE: this will "break" the Blink layout tests css3/filters/effect-reference-subregion-chained-hw.html and css3/filters/effect-reference-subregion-hw.html, but it actually makes them give correct results. It should be suppressed on the skia roll, and I'll rebaseline it.
R=reed@google.com
Review URL: https://codereview.chromium.org/112803004
git-svn-id: http://skia.googlecode.com/svn/trunk@12895 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-03 21:48:22 +00:00
|
|
|
#include "SkMergeImageFilter.h"
|
|
|
|
#include "SkMorphologyImageFilter.h"
|
|
|
|
#include "SkOffsetImageFilter.h"
|
2016-01-08 22:58:35 +00:00
|
|
|
#include "SkPaintImageFilter.h"
|
2014-10-29 19:36:32 +00:00
|
|
|
#include "SkPerlinNoiseShader.h"
|
2014-02-05 22:36:31 +00:00
|
|
|
#include "SkPicture.h"
|
2014-05-30 20:36:15 +00:00
|
|
|
#include "SkPictureImageFilter.h"
|
2014-04-18 18:04:41 +00:00
|
|
|
#include "SkPictureRecorder.h"
|
2015-07-13 20:16:44 +00:00
|
|
|
#include "SkPoint3.h"
|
2014-08-19 13:27:53 +00:00
|
|
|
#include "SkReadBuffer.h"
|
2014-01-24 20:56:26 +00:00
|
|
|
#include "SkRect.h"
|
2016-03-07 20:45:14 +00:00
|
|
|
#include "SkSpecialImage.h"
|
|
|
|
#include "SkSpecialSurface.h"
|
2015-09-14 20:31:18 +00:00
|
|
|
#include "SkSurface.h"
|
2015-08-20 18:10:41 +00:00
|
|
|
#include "SkTableColorFilter.h"
|
Make SkImageFilter crop rects relative to the primitive origin, instead of relative to their parent's crop rect. This is required by SVG semantics, and is more sane anyway.
To do this, this patch changes the "offset/loc" parameter in filterImage() / onFilterImage() from an inout-param to an out-param only, so that the calling filter can know how much the input filter wants its result offset (and doesn't include the original primitive position). This offset can then be applied to the current filter's crop rect. (I've renamed the parameter "offset" in all cases to make this clear.) This makes the call sites in SkCanvas/SkGpuDevice responsible for applying the resulting offset to the primitive's position, which is actually a fairly small change.
This change also fixes SkTileImageFilter and SkOffsetImageFilter to correctly handle an input offset, which they weren't before. This required modifying the GM's, since they assumed the broken behaviour.
NOTE: this will require rebaselining the imagefiltersgraph test, since it has a new test case.
NOTE: this will "break" the Blink layout tests css3/filters/effect-reference-subregion-chained-hw.html and css3/filters/effect-reference-subregion-hw.html, but it actually makes them give correct results. It should be suppressed on the skia roll, and I'll rebaseline it.
R=reed@google.com
Review URL: https://codereview.chromium.org/112803004
git-svn-id: http://skia.googlecode.com/svn/trunk@12895 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-03 21:48:22 +00:00
|
|
|
#include "SkTileImageFilter.h"
|
|
|
|
#include "SkXfermodeImageFilter.h"
|
2014-01-24 20:56:26 +00:00
|
|
|
#include "Test.h"
|
2016-03-07 20:45:14 +00:00
|
|
|
#include "TestingSpecialImageAccess.h"
|
2013-07-24 22:19:24 +00:00
|
|
|
|
2014-02-03 22:22:16 +00:00
|
|
|
#if SK_SUPPORT_GPU
|
2015-12-01 12:35:26 +00:00
|
|
|
#include "GrContext.h"
|
2014-02-03 22:22:16 +00:00
|
|
|
#include "SkGpuDevice.h"
|
|
|
|
#endif
|
|
|
|
|
2013-12-18 22:15:12 +00:00
|
|
|
static const int kBitmapSize = 4;
|
|
|
|
|
2014-02-05 22:36:31 +00:00
|
|
|
namespace {
|
|
|
|
|
|
|
|
class MatrixTestImageFilter : public SkImageFilter {
|
|
|
|
public:
|
2016-04-04 12:05:11 +00:00
|
|
|
static sk_sp<SkImageFilter> Make(skiatest::Reporter* reporter,
|
|
|
|
const SkMatrix& expectedMatrix) {
|
|
|
|
return sk_sp<SkImageFilter>(new MatrixTestImageFilter(reporter, expectedMatrix));
|
2014-02-05 22:36:31 +00:00
|
|
|
}
|
|
|
|
|
2016-04-04 12:05:11 +00:00
|
|
|
SK_TO_STRING_OVERRIDE()
|
|
|
|
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(MatrixTestImageFilter)
|
|
|
|
|
|
|
|
protected:
|
2016-04-04 19:07:47 +00:00
|
|
|
sk_sp<SkSpecialImage> onFilterImage(SkSpecialImage* source, const Context& ctx,
|
|
|
|
SkIPoint* offset) const override {
|
2014-03-14 15:44:01 +00:00
|
|
|
REPORTER_ASSERT(fReporter, ctx.ctm() == fExpectedMatrix);
|
2016-04-04 19:07:47 +00:00
|
|
|
offset->fX = offset->fY = 0;
|
|
|
|
return sk_ref_sp<SkSpecialImage>(source);
|
2014-02-05 22:36:31 +00:00
|
|
|
}
|
|
|
|
|
2015-03-26 01:17:31 +00:00
|
|
|
void flatten(SkWriteBuffer& buffer) const override {
|
2014-08-21 14:59:51 +00:00
|
|
|
this->INHERITED::flatten(buffer);
|
2014-02-05 22:36:31 +00:00
|
|
|
buffer.writeFunctionPtr(fReporter);
|
|
|
|
buffer.writeMatrix(fExpectedMatrix);
|
|
|
|
}
|
|
|
|
|
|
|
|
private:
|
2016-04-04 12:05:11 +00:00
|
|
|
MatrixTestImageFilter(skiatest::Reporter* reporter, const SkMatrix& expectedMatrix)
|
|
|
|
: INHERITED(nullptr, 0, nullptr)
|
|
|
|
, fReporter(reporter)
|
|
|
|
, fExpectedMatrix(expectedMatrix) {
|
|
|
|
}
|
|
|
|
|
2014-02-05 22:36:31 +00:00
|
|
|
skiatest::Reporter* fReporter;
|
|
|
|
SkMatrix fExpectedMatrix;
|
2014-12-01 19:47:08 +00:00
|
|
|
|
2014-08-21 14:59:51 +00:00
|
|
|
typedef SkImageFilter INHERITED;
|
2014-02-05 22:36:31 +00:00
|
|
|
};
|
|
|
|
|
2016-04-05 11:43:45 +00:00
|
|
|
class FailImageFilter : public SkImageFilter {
|
|
|
|
public:
|
|
|
|
FailImageFilter() : SkImageFilter(0, nullptr) {
|
|
|
|
}
|
|
|
|
|
|
|
|
sk_sp<SkSpecialImage> onFilterImage(SkSpecialImage* source,
|
|
|
|
const Context& ctx,
|
|
|
|
SkIPoint* offset) const override {
|
|
|
|
return nullptr;
|
|
|
|
}
|
|
|
|
|
|
|
|
SK_TO_STRING_OVERRIDE()
|
|
|
|
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(FailImageFilter)
|
|
|
|
|
|
|
|
private:
|
|
|
|
typedef SkImageFilter INHERITED;
|
|
|
|
};
|
|
|
|
|
|
|
|
sk_sp<SkFlattenable> FailImageFilter::CreateProc(SkReadBuffer& buffer) {
|
|
|
|
SK_IMAGEFILTER_UNFLATTEN_COMMON(common, 0);
|
|
|
|
return sk_sp<SkFlattenable>(new FailImageFilter());
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifndef SK_IGNORE_TO_STRING
|
|
|
|
void FailImageFilter::toString(SkString* str) const {
|
|
|
|
str->appendf("FailImageFilter: (");
|
|
|
|
str->append(")");
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2016-03-23 20:44:26 +00:00
|
|
|
void draw_gradient_circle(SkCanvas* canvas, int width, int height) {
|
|
|
|
SkScalar x = SkIntToScalar(width / 2);
|
|
|
|
SkScalar y = SkIntToScalar(height / 2);
|
|
|
|
SkScalar radius = SkMinScalar(x, y) * 0.8f;
|
|
|
|
canvas->clear(0x00000000);
|
|
|
|
SkColor colors[2];
|
|
|
|
colors[0] = SK_ColorWHITE;
|
|
|
|
colors[1] = SK_ColorBLACK;
|
|
|
|
sk_sp<SkShader> shader(
|
|
|
|
SkGradientShader::MakeRadial(SkPoint::Make(x, y), radius, colors, nullptr, 2,
|
|
|
|
SkShader::kClamp_TileMode)
|
|
|
|
);
|
|
|
|
SkPaint paint;
|
|
|
|
paint.setShader(shader);
|
|
|
|
canvas->drawCircle(x, y, radius, paint);
|
|
|
|
}
|
|
|
|
|
|
|
|
SkBitmap make_gradient_circle(int width, int height) {
|
|
|
|
SkBitmap bitmap;
|
|
|
|
bitmap.allocN32Pixels(width, height);
|
|
|
|
SkCanvas canvas(bitmap);
|
|
|
|
draw_gradient_circle(&canvas, width, height);
|
|
|
|
return bitmap;
|
|
|
|
}
|
|
|
|
|
|
|
|
class FilterList {
|
|
|
|
public:
|
2016-04-05 16:09:36 +00:00
|
|
|
FilterList(sk_sp<SkImageFilter> input, const SkImageFilter::CropRect* cropRect = nullptr) {
|
2016-03-23 20:44:26 +00:00
|
|
|
SkPoint3 location = SkPoint3::Make(0, 0, SK_Scalar1);
|
|
|
|
const SkScalar five = SkIntToScalar(5);
|
|
|
|
|
2016-04-04 11:31:25 +00:00
|
|
|
{
|
|
|
|
sk_sp<SkColorFilter> cf(SkColorFilter::MakeModeFilter(SK_ColorRED,
|
|
|
|
SkXfermode::kSrcIn_Mode));
|
2016-03-23 20:44:26 +00:00
|
|
|
|
2016-04-04 11:31:25 +00:00
|
|
|
this->addFilter("color filter",
|
2016-04-08 23:28:09 +00:00
|
|
|
SkColorFilterImageFilter::Make(std::move(cf), input, cropRect));
|
2016-04-04 11:31:25 +00:00
|
|
|
}
|
2016-03-23 20:44:26 +00:00
|
|
|
|
2016-04-04 11:31:25 +00:00
|
|
|
{
|
|
|
|
sk_sp<SkImage> gradientImage(SkImage::MakeFromBitmap(make_gradient_circle(64, 64)));
|
|
|
|
sk_sp<SkImageFilter> gradientSource(SkImageSource::Make(std::move(gradientImage)));
|
|
|
|
|
2016-04-08 23:28:09 +00:00
|
|
|
this->addFilter("displacement map",
|
|
|
|
sk_sp<SkImageFilter>(SkDisplacementMapEffect::Create(
|
|
|
|
SkDisplacementMapEffect::kR_ChannelSelectorType,
|
|
|
|
SkDisplacementMapEffect::kB_ChannelSelectorType,
|
|
|
|
20.0f, gradientSource.get(), input.get(), cropRect)));
|
2016-04-04 11:31:25 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
this->addFilter("blur", SkBlurImageFilter::Make(SK_Scalar1,
|
|
|
|
SK_Scalar1,
|
2016-04-05 16:09:36 +00:00
|
|
|
input,
|
2016-04-08 23:28:09 +00:00
|
|
|
cropRect));
|
2016-04-06 15:40:59 +00:00
|
|
|
this->addFilter("drop shadow", SkDropShadowImageFilter::Make(
|
2016-03-23 20:44:26 +00:00
|
|
|
SK_Scalar1, SK_Scalar1, SK_Scalar1, SK_Scalar1, SK_ColorGREEN,
|
2016-04-05 16:09:36 +00:00
|
|
|
SkDropShadowImageFilter::kDrawShadowAndForeground_ShadowMode,
|
2016-04-08 23:28:09 +00:00
|
|
|
input, cropRect));
|
|
|
|
this->addFilter("diffuse lighting",
|
|
|
|
SkLightingImageFilter::MakePointLitDiffuse(location, SK_ColorGREEN, 0, 0,
|
|
|
|
input, cropRect));
|
2016-03-23 20:44:26 +00:00
|
|
|
this->addFilter("specular lighting",
|
2016-04-08 23:28:09 +00:00
|
|
|
SkLightingImageFilter::MakePointLitSpecular(location, SK_ColorGREEN, 0, 0, 0,
|
|
|
|
input, cropRect));
|
|
|
|
{
|
|
|
|
SkScalar kernel[9] = {
|
|
|
|
SkIntToScalar(1), SkIntToScalar(1), SkIntToScalar(1),
|
|
|
|
SkIntToScalar(1), SkIntToScalar(-7), SkIntToScalar(1),
|
|
|
|
SkIntToScalar(1), SkIntToScalar(1), SkIntToScalar(1),
|
|
|
|
};
|
|
|
|
const SkISize kernelSize = SkISize::Make(3, 3);
|
|
|
|
const SkScalar gain = SK_Scalar1, bias = 0;
|
|
|
|
|
|
|
|
this->addFilter("matrix convolution",
|
2016-04-08 15:01:20 +00:00
|
|
|
SkMatrixConvolutionImageFilter::Make(
|
2016-03-23 20:44:26 +00:00
|
|
|
kernelSize, kernel, gain, bias, SkIPoint::Make(1, 1),
|
2016-04-05 16:09:36 +00:00
|
|
|
SkMatrixConvolutionImageFilter::kRepeat_TileMode, false,
|
2016-04-08 23:28:09 +00:00
|
|
|
input, cropRect));
|
|
|
|
}
|
|
|
|
|
2016-04-05 16:09:36 +00:00
|
|
|
this->addFilter("merge", SkMergeImageFilter::Make(input, input,
|
2016-03-30 20:34:16 +00:00
|
|
|
SkXfermode::kSrcOver_Mode,
|
2016-04-08 23:28:09 +00:00
|
|
|
cropRect));
|
|
|
|
|
2016-04-04 11:31:25 +00:00
|
|
|
{
|
|
|
|
SkPaint greenColorShaderPaint;
|
|
|
|
greenColorShaderPaint.setShader(SkShader::MakeColorShader(SK_ColorGREEN));
|
|
|
|
|
|
|
|
SkImageFilter::CropRect leftSideCropRect(SkRect::MakeXYWH(0, 0, 32, 64));
|
|
|
|
sk_sp<SkImageFilter> paintFilterLeft(SkPaintImageFilter::Make(greenColorShaderPaint,
|
|
|
|
&leftSideCropRect));
|
|
|
|
SkImageFilter::CropRect rightSideCropRect(SkRect::MakeXYWH(32, 0, 32, 64));
|
|
|
|
sk_sp<SkImageFilter> paintFilterRight(SkPaintImageFilter::Make(greenColorShaderPaint,
|
|
|
|
&rightSideCropRect));
|
|
|
|
|
|
|
|
|
|
|
|
this->addFilter("merge with disjoint inputs", SkMergeImageFilter::Make(
|
2016-03-30 20:34:16 +00:00
|
|
|
std::move(paintFilterLeft), std::move(paintFilterRight),
|
2016-04-08 23:28:09 +00:00
|
|
|
SkXfermode::kSrcOver_Mode, cropRect));
|
2016-04-04 11:31:25 +00:00
|
|
|
}
|
|
|
|
|
2016-03-23 20:44:26 +00:00
|
|
|
this->addFilter("offset",
|
2016-04-05 16:09:36 +00:00
|
|
|
SkOffsetImageFilter::Make(SK_Scalar1, SK_Scalar1, input,
|
2016-04-08 23:28:09 +00:00
|
|
|
cropRect));
|
|
|
|
this->addFilter("dilate", SkDilateImageFilter::Make(3, 2, input, cropRect));
|
|
|
|
this->addFilter("erode", SkErodeImageFilter::Make(2, 3, input, cropRect));
|
|
|
|
this->addFilter("tile", sk_sp<SkImageFilter>(SkTileImageFilter::Create(
|
2016-03-23 20:44:26 +00:00
|
|
|
SkRect::MakeXYWH(0, 0, 50, 50),
|
|
|
|
cropRect ? cropRect->rect() : SkRect::MakeXYWH(0, 0, 100, 100),
|
2016-04-08 23:28:09 +00:00
|
|
|
input.get())));
|
|
|
|
|
2016-03-23 20:44:26 +00:00
|
|
|
if (!cropRect) {
|
2016-04-08 23:28:09 +00:00
|
|
|
SkMatrix matrix;
|
|
|
|
|
|
|
|
matrix.setTranslate(SK_Scalar1, SK_Scalar1);
|
|
|
|
matrix.postRotate(SkIntToScalar(45), SK_Scalar1, SK_Scalar1);
|
|
|
|
|
2016-04-05 22:09:00 +00:00
|
|
|
this->addFilter("matrix",
|
2016-04-08 23:28:09 +00:00
|
|
|
SkImageFilter::MakeMatrixFilter(matrix, kLow_SkFilterQuality, input));
|
2016-03-23 20:44:26 +00:00
|
|
|
}
|
2016-04-04 11:31:25 +00:00
|
|
|
{
|
2016-04-05 16:09:36 +00:00
|
|
|
sk_sp<SkImageFilter> blur(SkBlurImageFilter::Make(five, five, input));
|
2016-04-04 11:31:25 +00:00
|
|
|
|
|
|
|
this->addFilter("blur and offset", SkOffsetImageFilter::Make(five, five,
|
|
|
|
std::move(blur),
|
2016-04-08 23:28:09 +00:00
|
|
|
cropRect));
|
2016-04-04 11:31:25 +00:00
|
|
|
}
|
|
|
|
{
|
|
|
|
SkRTreeFactory factory;
|
|
|
|
SkPictureRecorder recorder;
|
|
|
|
SkCanvas* recordingCanvas = recorder.beginRecording(64, 64, &factory, 0);
|
|
|
|
|
|
|
|
SkPaint greenPaint;
|
|
|
|
greenPaint.setColor(SK_ColorGREEN);
|
|
|
|
recordingCanvas->drawRect(SkRect::Make(SkIRect::MakeXYWH(10, 10, 30, 20)), greenPaint);
|
|
|
|
sk_sp<SkPicture> picture(recorder.finishRecordingAsPicture());
|
|
|
|
sk_sp<SkImageFilter> pictureFilter(SkPictureImageFilter::Make(std::move(picture)));
|
|
|
|
|
|
|
|
this->addFilter("picture and blur", SkBlurImageFilter::Make(five, five,
|
|
|
|
std::move(pictureFilter),
|
2016-04-08 23:28:09 +00:00
|
|
|
cropRect));
|
2016-04-04 11:31:25 +00:00
|
|
|
}
|
|
|
|
{
|
|
|
|
SkPaint paint;
|
|
|
|
paint.setShader(SkPerlinNoiseShader::MakeTurbulence(SK_Scalar1, SK_Scalar1, 1, 0));
|
|
|
|
sk_sp<SkImageFilter> paintFilter(SkPaintImageFilter::Make(paint));
|
|
|
|
|
|
|
|
this->addFilter("paint and blur", SkBlurImageFilter::Make(five, five,
|
|
|
|
std::move(paintFilter),
|
2016-04-08 23:28:09 +00:00
|
|
|
cropRect));
|
2016-04-04 11:31:25 +00:00
|
|
|
}
|
2016-03-29 18:32:50 +00:00
|
|
|
this->addFilter("xfermode", SkXfermodeImageFilter::Make(
|
2016-04-08 23:28:09 +00:00
|
|
|
SkXfermode::Make(SkXfermode::kSrc_Mode), input, input, cropRect));
|
2016-03-23 20:44:26 +00:00
|
|
|
}
|
|
|
|
int count() const { return fFilters.count(); }
|
|
|
|
SkImageFilter* getFilter(int index) const { return fFilters[index].fFilter.get(); }
|
|
|
|
const char* getName(int index) const { return fFilters[index].fName; }
|
|
|
|
private:
|
|
|
|
struct Filter {
|
2016-04-08 23:28:09 +00:00
|
|
|
Filter() : fName(nullptr) {}
|
|
|
|
Filter(const char* name, sk_sp<SkImageFilter> filter)
|
|
|
|
: fName(name)
|
|
|
|
, fFilter(std::move(filter)) {
|
|
|
|
}
|
2016-03-23 20:44:26 +00:00
|
|
|
const char* fName;
|
|
|
|
sk_sp<SkImageFilter> fFilter;
|
|
|
|
};
|
2016-04-08 23:28:09 +00:00
|
|
|
void addFilter(const char* name, sk_sp<SkImageFilter> filter) {
|
|
|
|
fFilters.push_back(Filter(name, std::move(filter)));
|
2016-03-23 20:44:26 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
SkTArray<Filter> fFilters;
|
|
|
|
};
|
|
|
|
|
2014-02-05 22:36:31 +00:00
|
|
|
}
|
|
|
|
|
2016-04-03 16:11:13 +00:00
|
|
|
sk_sp<SkFlattenable> MatrixTestImageFilter::CreateProc(SkReadBuffer& buffer) {
|
2014-08-21 14:59:51 +00:00
|
|
|
SK_IMAGEFILTER_UNFLATTEN_COMMON(common, 1);
|
|
|
|
skiatest::Reporter* reporter = (skiatest::Reporter*)buffer.readFunctionPtr();
|
|
|
|
SkMatrix matrix;
|
|
|
|
buffer.readMatrix(&matrix);
|
2016-04-04 12:05:11 +00:00
|
|
|
return MatrixTestImageFilter::Make(reporter, matrix);
|
2014-08-21 14:59:51 +00:00
|
|
|
}
|
|
|
|
|
2014-12-19 21:49:15 +00:00
|
|
|
#ifndef SK_IGNORE_TO_STRING
|
|
|
|
void MatrixTestImageFilter::toString(SkString* str) const {
|
|
|
|
str->appendf("MatrixTestImageFilter: (");
|
|
|
|
str->append(")");
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2016-03-17 17:51:11 +00:00
|
|
|
static sk_sp<SkImage> make_small_image() {
|
2016-03-24 01:59:25 +00:00
|
|
|
auto surface(SkSurface::MakeRasterN32Premul(kBitmapSize, kBitmapSize));
|
2015-09-15 18:26:13 +00:00
|
|
|
SkCanvas* canvas = surface->getCanvas();
|
|
|
|
canvas->clear(0x00000000);
|
2013-12-18 22:15:12 +00:00
|
|
|
SkPaint darkPaint;
|
|
|
|
darkPaint.setColor(0xFF804020);
|
|
|
|
SkPaint lightPaint;
|
|
|
|
lightPaint.setColor(0xFF244484);
|
|
|
|
const int i = kBitmapSize / 4;
|
|
|
|
for (int y = 0; y < kBitmapSize; y += i) {
|
|
|
|
for (int x = 0; x < kBitmapSize; x += i) {
|
2015-09-15 18:26:13 +00:00
|
|
|
canvas->save();
|
|
|
|
canvas->translate(SkIntToScalar(x), SkIntToScalar(y));
|
|
|
|
canvas->drawRect(SkRect::MakeXYWH(0, 0,
|
2013-12-18 22:15:12 +00:00
|
|
|
SkIntToScalar(i),
|
|
|
|
SkIntToScalar(i)), darkPaint);
|
2015-09-15 18:26:13 +00:00
|
|
|
canvas->drawRect(SkRect::MakeXYWH(SkIntToScalar(i),
|
2013-12-18 22:15:12 +00:00
|
|
|
0,
|
|
|
|
SkIntToScalar(i),
|
|
|
|
SkIntToScalar(i)), lightPaint);
|
2015-09-15 18:26:13 +00:00
|
|
|
canvas->drawRect(SkRect::MakeXYWH(0,
|
2013-12-18 22:15:12 +00:00
|
|
|
SkIntToScalar(i),
|
|
|
|
SkIntToScalar(i),
|
|
|
|
SkIntToScalar(i)), lightPaint);
|
2015-09-15 18:26:13 +00:00
|
|
|
canvas->drawRect(SkRect::MakeXYWH(SkIntToScalar(i),
|
2013-12-18 22:15:12 +00:00
|
|
|
SkIntToScalar(i),
|
|
|
|
SkIntToScalar(i),
|
|
|
|
SkIntToScalar(i)), darkPaint);
|
2015-09-15 18:26:13 +00:00
|
|
|
canvas->restore();
|
Fixed issues found by fuzzer
Last week, the fuzzer found a few numerical issue with filters and I had written some fixes for them. Here are the fixes with some unit tests.
For senorblanco : So I figured out what was asserting when we'd get a 0 width "result" in SkBicubicImageFilter::onFilterImage(). Basically, if the "result" SkBitmap object calls SkBitmap::setConfig() with "width" and/or "height" set to 0, then the SkBitmap object will call SkBitmap::reset(), making the SkBitmap object's config invalid. At this point, calling SkBitmap::getAddr32() will assert, even without attempting to dereference the data pointer, because the SkBitmap's config is invalid. If height is valid, but width is 0, then this call to SkBitmap::getAddr32() happens directly in SkBicubicImageFilter::onFilterImage() a few lines lower and asserts right away.
BUG=
R=senorblanco@google.com, senorblanco@chromium.org, bsalomon@google.com
Author: sugoi@chromium.org
Review URL: https://chromiumcodereview.appspot.com/23533042
git-svn-id: http://skia.googlecode.com/svn/trunk@11249 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-09-13 12:40:02 +00:00
|
|
|
}
|
|
|
|
}
|
2015-09-15 18:26:13 +00:00
|
|
|
|
2016-03-17 17:51:11 +00:00
|
|
|
return surface->makeImageSnapshot();
|
2013-12-18 22:15:12 +00:00
|
|
|
}
|
|
|
|
|
2016-04-05 18:50:42 +00:00
|
|
|
static sk_sp<SkImageFilter> make_scale(float amount, sk_sp<SkImageFilter> input) {
|
2013-12-18 22:15:12 +00:00
|
|
|
SkScalar s = amount;
|
|
|
|
SkScalar matrix[20] = { s, 0, 0, 0, 0,
|
|
|
|
0, s, 0, 0, 0,
|
|
|
|
0, 0, s, 0, 0,
|
|
|
|
0, 0, 0, s, 0 };
|
2016-04-05 18:50:42 +00:00
|
|
|
sk_sp<SkColorFilter> filter(SkColorFilter::MakeMatrixFilterRowMajor255(matrix));
|
|
|
|
return SkColorFilterImageFilter::Make(std::move(filter), std::move(input));
|
2013-12-18 22:15:12 +00:00
|
|
|
}
|
|
|
|
|
2016-04-05 18:50:42 +00:00
|
|
|
static sk_sp<SkImageFilter> make_grayscale(sk_sp<SkImageFilter> input,
|
|
|
|
const SkImageFilter::CropRect* cropRect) {
|
2013-12-18 22:15:12 +00:00
|
|
|
SkScalar matrix[20];
|
|
|
|
memset(matrix, 0, 20 * sizeof(SkScalar));
|
|
|
|
matrix[0] = matrix[5] = matrix[10] = 0.2126f;
|
|
|
|
matrix[1] = matrix[6] = matrix[11] = 0.7152f;
|
|
|
|
matrix[2] = matrix[7] = matrix[12] = 0.0722f;
|
|
|
|
matrix[18] = 1.0f;
|
2016-04-05 18:50:42 +00:00
|
|
|
sk_sp<SkColorFilter> filter(SkColorFilter::MakeMatrixFilterRowMajor255(matrix));
|
|
|
|
return SkColorFilterImageFilter::Make(std::move(filter), std::move(input), cropRect);
|
2013-12-18 22:15:12 +00:00
|
|
|
}
|
|
|
|
|
2016-04-05 18:50:42 +00:00
|
|
|
static sk_sp<SkImageFilter> make_blue(sk_sp<SkImageFilter> input,
|
|
|
|
const SkImageFilter::CropRect* cropRect) {
|
|
|
|
sk_sp<SkColorFilter> filter(SkColorFilter::MakeModeFilter(SK_ColorBLUE,
|
|
|
|
SkXfermode::kSrcIn_Mode));
|
|
|
|
return SkColorFilterImageFilter::Make(std::move(filter), std::move(input), cropRect);
|
2015-03-08 11:42:52 +00:00
|
|
|
}
|
|
|
|
|
2016-03-17 21:31:39 +00:00
|
|
|
static sk_sp<SkSpecialSurface> create_empty_special_surface(GrContext* context,
|
|
|
|
SkImageFilter::Proxy* proxy,
|
|
|
|
int widthHeight) {
|
2016-03-07 20:45:14 +00:00
|
|
|
if (context) {
|
|
|
|
GrSurfaceDesc desc;
|
|
|
|
desc.fConfig = kSkia8888_GrPixelConfig;
|
|
|
|
desc.fFlags = kRenderTarget_GrSurfaceFlag;
|
|
|
|
desc.fWidth = widthHeight;
|
|
|
|
desc.fHeight = widthHeight;
|
2016-03-17 21:31:39 +00:00
|
|
|
return SkSpecialSurface::MakeRenderTarget(proxy, context, desc);
|
2016-03-07 20:45:14 +00:00
|
|
|
} else {
|
|
|
|
const SkImageInfo info = SkImageInfo::MakeN32(widthHeight, widthHeight,
|
|
|
|
kOpaque_SkAlphaType);
|
2016-03-17 21:31:39 +00:00
|
|
|
return SkSpecialSurface::MakeRaster(proxy, info);
|
2016-03-07 20:45:14 +00:00
|
|
|
}
|
2016-03-16 23:15:53 +00:00
|
|
|
}
|
|
|
|
|
2016-03-17 21:31:39 +00:00
|
|
|
static sk_sp<SkSpecialImage> create_empty_special_image(GrContext* context,
|
|
|
|
SkImageFilter::Proxy* proxy,
|
|
|
|
int widthHeight) {
|
|
|
|
sk_sp<SkSpecialSurface> surf(create_empty_special_surface(context, proxy, widthHeight));
|
2016-03-07 20:45:14 +00:00
|
|
|
|
|
|
|
SkASSERT(surf);
|
|
|
|
|
|
|
|
SkCanvas* canvas = surf->getCanvas();
|
|
|
|
SkASSERT(canvas);
|
|
|
|
|
|
|
|
canvas->clear(0x0);
|
|
|
|
|
2016-03-17 21:31:39 +00:00
|
|
|
return surf->makeImageSnapshot();
|
2016-03-07 20:45:14 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2013-12-18 22:15:12 +00:00
|
|
|
DEF_TEST(ImageFilter, reporter) {
|
|
|
|
{
|
2015-03-08 11:42:52 +00:00
|
|
|
// Check that two non-clipping color-matrice-filters concatenate into a single filter.
|
2016-04-05 18:50:42 +00:00
|
|
|
sk_sp<SkImageFilter> halfBrightness(make_scale(0.5f, nullptr));
|
|
|
|
sk_sp<SkImageFilter> quarterBrightness(make_scale(0.5f, std::move(halfBrightness)));
|
2015-08-27 14:41:13 +00:00
|
|
|
REPORTER_ASSERT(reporter, nullptr == quarterBrightness->getInput(0));
|
2015-03-08 11:42:52 +00:00
|
|
|
SkColorFilter* cf;
|
|
|
|
REPORTER_ASSERT(reporter, quarterBrightness->asColorFilter(&cf));
|
2015-08-27 14:41:13 +00:00
|
|
|
REPORTER_ASSERT(reporter, cf->asColorMatrix(nullptr));
|
2015-03-08 11:42:52 +00:00
|
|
|
cf->unref();
|
2013-07-24 22:19:24 +00:00
|
|
|
}
|
|
|
|
|
2013-12-18 22:15:12 +00:00
|
|
|
{
|
2015-03-08 11:42:52 +00:00
|
|
|
// Check that a clipping color-matrice-filter followed by a color-matrice-filters
|
|
|
|
// concatenates into a single filter, but not a matrixfilter (due to clamping).
|
2016-04-05 18:50:42 +00:00
|
|
|
sk_sp<SkImageFilter> doubleBrightness(make_scale(2.0f, nullptr));
|
|
|
|
sk_sp<SkImageFilter> halfBrightness(make_scale(0.5f, std::move(doubleBrightness)));
|
2015-08-27 14:41:13 +00:00
|
|
|
REPORTER_ASSERT(reporter, nullptr == halfBrightness->getInput(0));
|
2015-03-08 11:42:52 +00:00
|
|
|
SkColorFilter* cf;
|
|
|
|
REPORTER_ASSERT(reporter, halfBrightness->asColorFilter(&cf));
|
2015-08-27 14:41:13 +00:00
|
|
|
REPORTER_ASSERT(reporter, !cf->asColorMatrix(nullptr));
|
2015-03-08 11:42:52 +00:00
|
|
|
cf->unref();
|
2013-07-24 22:19:24 +00:00
|
|
|
}
|
|
|
|
|
2013-12-18 22:15:12 +00:00
|
|
|
{
|
|
|
|
// Check that a color filter image filter without a crop rect can be
|
|
|
|
// expressed as a color filter.
|
2016-04-05 18:50:42 +00:00
|
|
|
sk_sp<SkImageFilter> gray(make_grayscale(nullptr, nullptr));
|
2015-08-27 14:41:13 +00:00
|
|
|
REPORTER_ASSERT(reporter, true == gray->asColorFilter(nullptr));
|
2015-03-08 11:42:52 +00:00
|
|
|
}
|
2016-02-07 20:23:10 +00:00
|
|
|
|
2015-03-08 11:42:52 +00:00
|
|
|
{
|
|
|
|
// Check that a colorfilterimage filter without a crop rect but with an input
|
|
|
|
// that is another colorfilterimage can be expressed as a colorfilter (composed).
|
2016-04-05 18:50:42 +00:00
|
|
|
sk_sp<SkImageFilter> mode(make_blue(nullptr, nullptr));
|
|
|
|
sk_sp<SkImageFilter> gray(make_grayscale(std::move(mode), nullptr));
|
2015-08-27 14:41:13 +00:00
|
|
|
REPORTER_ASSERT(reporter, true == gray->asColorFilter(nullptr));
|
2013-07-24 22:19:24 +00:00
|
|
|
}
|
2015-03-05 22:47:29 +00:00
|
|
|
|
2015-03-08 11:42:52 +00:00
|
|
|
{
|
|
|
|
// Test that if we exceed the limit of what ComposeColorFilter can combine, we still
|
|
|
|
// can build the DAG and won't assert if we call asColorFilter.
|
2016-04-05 18:50:42 +00:00
|
|
|
sk_sp<SkImageFilter> filter(make_blue(nullptr, nullptr));
|
2015-03-08 11:42:52 +00:00
|
|
|
const int kWayTooManyForComposeColorFilter = 100;
|
|
|
|
for (int i = 0; i < kWayTooManyForComposeColorFilter; ++i) {
|
2016-04-05 18:50:42 +00:00
|
|
|
filter = make_blue(filter, nullptr);
|
2015-03-08 11:42:52 +00:00
|
|
|
// the first few of these will succeed, but after we hit the internal limit,
|
|
|
|
// it will then return false.
|
2015-08-27 14:41:13 +00:00
|
|
|
(void)filter->asColorFilter(nullptr);
|
2015-03-08 11:42:52 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-12-18 22:15:12 +00:00
|
|
|
{
|
|
|
|
// Check that a color filter image filter with a crop rect cannot
|
|
|
|
// be expressed as a color filter.
|
|
|
|
SkImageFilter::CropRect cropRect(SkRect::MakeXYWH(0, 0, 100, 100));
|
2016-04-05 18:50:42 +00:00
|
|
|
sk_sp<SkImageFilter> grayWithCrop(make_grayscale(nullptr, &cropRect));
|
2015-08-27 14:41:13 +00:00
|
|
|
REPORTER_ASSERT(reporter, false == grayWithCrop->asColorFilter(nullptr));
|
2013-12-18 22:15:12 +00:00
|
|
|
}
|
2013-07-24 22:19:24 +00:00
|
|
|
|
2014-07-03 18:13:09 +00:00
|
|
|
{
|
|
|
|
// Check that two non-commutative matrices are concatenated in
|
|
|
|
// the correct order.
|
|
|
|
SkScalar blueToRedMatrix[20] = { 0 };
|
|
|
|
blueToRedMatrix[2] = blueToRedMatrix[18] = SK_Scalar1;
|
|
|
|
SkScalar redToGreenMatrix[20] = { 0 };
|
|
|
|
redToGreenMatrix[5] = redToGreenMatrix[18] = SK_Scalar1;
|
2016-04-05 18:50:42 +00:00
|
|
|
sk_sp<SkColorFilter> blueToRed(SkColorFilter::MakeMatrixFilterRowMajor255(blueToRedMatrix));
|
|
|
|
sk_sp<SkImageFilter> filter1(SkColorFilterImageFilter::Make(std::move(blueToRed),
|
|
|
|
nullptr));
|
|
|
|
sk_sp<SkColorFilter> redToGreen(SkColorFilter::MakeMatrixFilterRowMajor255(redToGreenMatrix));
|
|
|
|
sk_sp<SkImageFilter> filter2(SkColorFilterImageFilter::Make(std::move(redToGreen),
|
|
|
|
std::move(filter1)));
|
2014-07-03 18:13:09 +00:00
|
|
|
|
|
|
|
SkBitmap result;
|
|
|
|
result.allocN32Pixels(kBitmapSize, kBitmapSize);
|
|
|
|
|
|
|
|
SkPaint paint;
|
|
|
|
paint.setColor(SK_ColorBLUE);
|
2016-04-05 18:50:42 +00:00
|
|
|
paint.setImageFilter(std::move(filter2));
|
2014-07-03 18:13:09 +00:00
|
|
|
SkCanvas canvas(result);
|
|
|
|
canvas.clear(0x0);
|
|
|
|
SkRect rect = SkRect::Make(SkIRect::MakeWH(kBitmapSize, kBitmapSize));
|
|
|
|
canvas.drawRect(rect, paint);
|
|
|
|
uint32_t pixel = *result.getAddr32(0, 0);
|
|
|
|
// The result here should be green, since we have effectively shifted blue to green.
|
|
|
|
REPORTER_ASSERT(reporter, pixel == SK_ColorGREEN);
|
|
|
|
}
|
|
|
|
|
2013-12-18 22:15:12 +00:00
|
|
|
{
|
|
|
|
// Tests pass by not asserting
|
2016-03-17 17:51:11 +00:00
|
|
|
sk_sp<SkImage> image(make_small_image());
|
2015-09-15 18:26:13 +00:00
|
|
|
SkBitmap result;
|
2014-02-13 14:41:43 +00:00
|
|
|
result.allocN32Pixels(kBitmapSize, kBitmapSize);
|
2013-07-24 22:19:24 +00:00
|
|
|
|
|
|
|
{
|
2013-12-18 22:15:12 +00:00
|
|
|
// This tests for :
|
|
|
|
// 1 ) location at (0,0,1)
|
2015-07-13 20:16:44 +00:00
|
|
|
SkPoint3 location = SkPoint3::Make(0, 0, SK_Scalar1);
|
2013-12-18 22:15:12 +00:00
|
|
|
// 2 ) location and target at same value
|
2015-07-13 20:16:44 +00:00
|
|
|
SkPoint3 target = SkPoint3::Make(location.fX, location.fY, location.fZ);
|
2013-12-18 22:15:12 +00:00
|
|
|
// 3 ) large negative specular exponent value
|
|
|
|
SkScalar specularExponent = -1000;
|
|
|
|
|
2016-04-01 16:28:51 +00:00
|
|
|
sk_sp<SkImageFilter> bmSrc(SkImageSource::Make(std::move(image)));
|
2013-12-18 22:15:12 +00:00
|
|
|
SkPaint paint;
|
2016-04-08 23:28:09 +00:00
|
|
|
paint.setImageFilter(SkLightingImageFilter::MakeSpotLitSpecular(
|
2013-12-18 22:15:12 +00:00
|
|
|
location, target, specularExponent, 180,
|
|
|
|
0xFFFFFFFF, SK_Scalar1, SK_Scalar1, SK_Scalar1,
|
2016-04-08 23:28:09 +00:00
|
|
|
std::move(bmSrc)));
|
2013-12-18 22:15:12 +00:00
|
|
|
SkCanvas canvas(result);
|
|
|
|
SkRect r = SkRect::MakeWH(SkIntToScalar(kBitmapSize),
|
|
|
|
SkIntToScalar(kBitmapSize));
|
|
|
|
canvas.drawRect(r, paint);
|
2013-07-24 22:19:24 +00:00
|
|
|
}
|
|
|
|
}
|
2014-02-03 22:22:16 +00:00
|
|
|
}
|
Make SkImageFilter crop rects relative to the primitive origin, instead of relative to their parent's crop rect. This is required by SVG semantics, and is more sane anyway.
To do this, this patch changes the "offset/loc" parameter in filterImage() / onFilterImage() from an inout-param to an out-param only, so that the calling filter can know how much the input filter wants its result offset (and doesn't include the original primitive position). This offset can then be applied to the current filter's crop rect. (I've renamed the parameter "offset" in all cases to make this clear.) This makes the call sites in SkCanvas/SkGpuDevice responsible for applying the resulting offset to the primitive's position, which is actually a fairly small change.
This change also fixes SkTileImageFilter and SkOffsetImageFilter to correctly handle an input offset, which they weren't before. This required modifying the GM's, since they assumed the broken behaviour.
NOTE: this will require rebaselining the imagefiltersgraph test, since it has a new test case.
NOTE: this will "break" the Blink layout tests css3/filters/effect-reference-subregion-chained-hw.html and css3/filters/effect-reference-subregion-hw.html, but it actually makes them give correct results. It should be suppressed on the skia roll, and I'll rebaseline it.
R=reed@google.com
Review URL: https://codereview.chromium.org/112803004
git-svn-id: http://skia.googlecode.com/svn/trunk@12895 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-03 21:48:22 +00:00
|
|
|
|
2016-03-07 20:45:14 +00:00
|
|
|
static void test_crop_rects(SkImageFilter::Proxy* proxy,
|
|
|
|
skiatest::Reporter* reporter,
|
|
|
|
GrContext* context) {
|
2014-02-03 22:22:16 +00:00
|
|
|
// Check that all filters offset to their absolute crop rect,
|
|
|
|
// unaffected by the input crop rect.
|
|
|
|
// Tests pass by not asserting.
|
2016-03-17 21:31:39 +00:00
|
|
|
sk_sp<SkSpecialImage> srcImg(create_empty_special_image(context, proxy, 100));
|
2016-03-07 20:45:14 +00:00
|
|
|
SkASSERT(srcImg);
|
2014-02-03 22:22:16 +00:00
|
|
|
|
|
|
|
SkImageFilter::CropRect inputCropRect(SkRect::MakeXYWH(8, 13, 80, 80));
|
|
|
|
SkImageFilter::CropRect cropRect(SkRect::MakeXYWH(20, 30, 60, 60));
|
2016-04-05 16:09:36 +00:00
|
|
|
sk_sp<SkImageFilter> input(make_grayscale(nullptr, &inputCropRect));
|
2014-02-03 22:22:16 +00:00
|
|
|
|
2016-04-05 16:09:36 +00:00
|
|
|
FilterList filters(input, &cropRect);
|
2014-02-03 22:22:16 +00:00
|
|
|
|
2016-03-23 20:44:26 +00:00
|
|
|
for (int i = 0; i < filters.count(); ++i) {
|
|
|
|
SkImageFilter* filter = filters.getFilter(i);
|
2014-02-03 22:22:16 +00:00
|
|
|
SkIPoint offset;
|
2016-01-11 18:56:59 +00:00
|
|
|
SkImageFilter::Context ctx(SkMatrix::I(), SkIRect::MakeWH(100, 100), nullptr);
|
2016-03-24 14:26:32 +00:00
|
|
|
sk_sp<SkSpecialImage> resultImg(filter->filterImage(srcImg.get(), ctx, &offset));
|
2016-03-23 20:44:26 +00:00
|
|
|
REPORTER_ASSERT_MESSAGE(reporter, resultImg, filters.getName(i));
|
|
|
|
REPORTER_ASSERT_MESSAGE(reporter, offset.fX == 20 && offset.fY == 30, filters.getName(i));
|
Make SkImageFilter crop rects relative to the primitive origin, instead of relative to their parent's crop rect. This is required by SVG semantics, and is more sane anyway.
To do this, this patch changes the "offset/loc" parameter in filterImage() / onFilterImage() from an inout-param to an out-param only, so that the calling filter can know how much the input filter wants its result offset (and doesn't include the original primitive position). This offset can then be applied to the current filter's crop rect. (I've renamed the parameter "offset" in all cases to make this clear.) This makes the call sites in SkCanvas/SkGpuDevice responsible for applying the resulting offset to the primitive's position, which is actually a fairly small change.
This change also fixes SkTileImageFilter and SkOffsetImageFilter to correctly handle an input offset, which they weren't before. This required modifying the GM's, since they assumed the broken behaviour.
NOTE: this will require rebaselining the imagefiltersgraph test, since it has a new test case.
NOTE: this will "break" the Blink layout tests css3/filters/effect-reference-subregion-chained-hw.html and css3/filters/effect-reference-subregion-hw.html, but it actually makes them give correct results. It should be suppressed on the skia roll, and I'll rebaseline it.
R=reed@google.com
Review URL: https://codereview.chromium.org/112803004
git-svn-id: http://skia.googlecode.com/svn/trunk@12895 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-03 21:48:22 +00:00
|
|
|
}
|
2013-12-18 22:15:12 +00:00
|
|
|
}
|
2014-02-03 22:22:16 +00:00
|
|
|
|
2016-03-07 20:45:14 +00:00
|
|
|
static void test_negative_blur_sigma(SkImageFilter::Proxy* proxy,
|
|
|
|
skiatest::Reporter* reporter,
|
|
|
|
GrContext* context) {
|
2014-09-09 16:15:04 +00:00
|
|
|
// Check that SkBlurImageFilter will accept a negative sigma, either in
|
|
|
|
// the given arguments or after CTM application.
|
2015-10-06 21:05:32 +00:00
|
|
|
const int width = 32, height = 32;
|
|
|
|
const SkScalar five = SkIntToScalar(5);
|
2014-09-09 16:15:04 +00:00
|
|
|
|
2016-04-04 11:31:25 +00:00
|
|
|
sk_sp<SkImageFilter> positiveFilter(SkBlurImageFilter::Make(five, five, nullptr));
|
|
|
|
sk_sp<SkImageFilter> negativeFilter(SkBlurImageFilter::Make(-five, five, nullptr));
|
2014-09-09 16:15:04 +00:00
|
|
|
|
|
|
|
SkBitmap gradient = make_gradient_circle(width, height);
|
2016-03-17 21:31:39 +00:00
|
|
|
sk_sp<SkSpecialImage> imgSrc(SkSpecialImage::MakeFromRaster(proxy,
|
|
|
|
SkIRect::MakeWH(width, height),
|
|
|
|
gradient));
|
2016-03-07 20:45:14 +00:00
|
|
|
|
2014-09-09 16:15:04 +00:00
|
|
|
SkIPoint offset;
|
2016-01-11 18:56:59 +00:00
|
|
|
SkImageFilter::Context ctx(SkMatrix::I(), SkIRect::MakeWH(32, 32), nullptr);
|
2016-03-07 20:45:14 +00:00
|
|
|
|
2016-03-24 14:26:32 +00:00
|
|
|
sk_sp<SkSpecialImage> positiveResult1(positiveFilter->filterImage(imgSrc.get(), ctx, &offset));
|
2016-03-07 20:45:14 +00:00
|
|
|
REPORTER_ASSERT(reporter, positiveResult1);
|
|
|
|
|
2016-03-24 14:26:32 +00:00
|
|
|
sk_sp<SkSpecialImage> negativeResult1(negativeFilter->filterImage(imgSrc.get(), ctx, &offset));
|
2016-03-07 20:45:14 +00:00
|
|
|
REPORTER_ASSERT(reporter, negativeResult1);
|
|
|
|
|
2014-09-09 16:15:04 +00:00
|
|
|
SkMatrix negativeScale;
|
|
|
|
negativeScale.setScale(-SK_Scalar1, SK_Scalar1);
|
2016-01-11 18:56:59 +00:00
|
|
|
SkImageFilter::Context negativeCTX(negativeScale, SkIRect::MakeWH(32, 32), nullptr);
|
2016-03-07 20:45:14 +00:00
|
|
|
|
2016-03-24 14:26:32 +00:00
|
|
|
sk_sp<SkSpecialImage> negativeResult2(positiveFilter->filterImage(imgSrc.get(),
|
|
|
|
negativeCTX,
|
|
|
|
&offset));
|
2016-03-07 20:45:14 +00:00
|
|
|
REPORTER_ASSERT(reporter, negativeResult2);
|
|
|
|
|
2016-03-24 14:26:32 +00:00
|
|
|
sk_sp<SkSpecialImage> positiveResult2(negativeFilter->filterImage(imgSrc.get(),
|
|
|
|
negativeCTX,
|
|
|
|
&offset));
|
2016-03-07 20:45:14 +00:00
|
|
|
REPORTER_ASSERT(reporter, positiveResult2);
|
|
|
|
|
|
|
|
|
|
|
|
SkBitmap positiveResultBM1, positiveResultBM2;
|
|
|
|
SkBitmap negativeResultBM1, negativeResultBM2;
|
|
|
|
|
2016-04-08 19:10:42 +00:00
|
|
|
REPORTER_ASSERT(reporter, positiveResult1->getROPixels(&positiveResultBM1));
|
|
|
|
REPORTER_ASSERT(reporter, positiveResult2->getROPixels(&positiveResultBM2));
|
|
|
|
REPORTER_ASSERT(reporter, negativeResult1->getROPixels(&negativeResultBM1));
|
|
|
|
REPORTER_ASSERT(reporter, negativeResult2->getROPixels(&negativeResultBM2));
|
2016-03-07 20:45:14 +00:00
|
|
|
|
|
|
|
SkAutoLockPixels lockP1(positiveResultBM1);
|
|
|
|
SkAutoLockPixels lockP2(positiveResultBM2);
|
|
|
|
SkAutoLockPixels lockN1(negativeResultBM1);
|
|
|
|
SkAutoLockPixels lockN2(negativeResultBM2);
|
2014-09-09 16:15:04 +00:00
|
|
|
for (int y = 0; y < height; y++) {
|
2016-03-07 20:45:14 +00:00
|
|
|
int diffs = memcmp(positiveResultBM1.getAddr32(0, y),
|
|
|
|
negativeResultBM1.getAddr32(0, y),
|
|
|
|
positiveResultBM1.rowBytes());
|
2014-09-09 16:15:04 +00:00
|
|
|
REPORTER_ASSERT(reporter, !diffs);
|
|
|
|
if (diffs) {
|
|
|
|
break;
|
|
|
|
}
|
2016-03-07 20:45:14 +00:00
|
|
|
diffs = memcmp(positiveResultBM1.getAddr32(0, y),
|
|
|
|
negativeResultBM2.getAddr32(0, y),
|
|
|
|
positiveResultBM1.rowBytes());
|
2014-09-09 16:15:04 +00:00
|
|
|
REPORTER_ASSERT(reporter, !diffs);
|
|
|
|
if (diffs) {
|
|
|
|
break;
|
|
|
|
}
|
2016-03-07 20:45:14 +00:00
|
|
|
diffs = memcmp(positiveResultBM1.getAddr32(0, y),
|
|
|
|
positiveResultBM2.getAddr32(0, y),
|
|
|
|
positiveResultBM1.rowBytes());
|
2014-09-09 16:15:04 +00:00
|
|
|
REPORTER_ASSERT(reporter, !diffs);
|
|
|
|
if (diffs) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-03-07 20:45:14 +00:00
|
|
|
typedef void (*PFTest)(SkImageFilter::Proxy* proxy,
|
|
|
|
skiatest::Reporter* reporter,
|
|
|
|
GrContext* context);
|
|
|
|
|
|
|
|
static void run_raster_test(skiatest::Reporter* reporter,
|
|
|
|
int widthHeight,
|
|
|
|
PFTest test) {
|
2015-06-22 16:46:59 +00:00
|
|
|
const SkSurfaceProps props(SkSurfaceProps::kLegacyFontHost_InitType);
|
|
|
|
|
2016-03-07 20:45:14 +00:00
|
|
|
const SkImageInfo info = SkImageInfo::MakeN32Premul(widthHeight, widthHeight);
|
|
|
|
|
2016-04-08 23:28:09 +00:00
|
|
|
sk_sp<SkBaseDevice> device(SkBitmapDevice::Create(info, props));
|
|
|
|
SkImageFilter::DeviceProxy proxy(device.get());
|
2015-06-22 16:46:59 +00:00
|
|
|
|
2016-03-07 20:45:14 +00:00
|
|
|
(*test)(&proxy, reporter, nullptr);
|
|
|
|
}
|
|
|
|
|
|
|
|
#if SK_SUPPORT_GPU
|
|
|
|
static void run_gpu_test(skiatest::Reporter* reporter,
|
|
|
|
GrContext* context,
|
|
|
|
int widthHeight,
|
|
|
|
PFTest test) {
|
|
|
|
const SkSurfaceProps props(SkSurfaceProps::kLegacyFontHost_InitType);
|
|
|
|
|
2016-04-08 23:28:09 +00:00
|
|
|
sk_sp<SkGpuDevice> device(SkGpuDevice::Create(context,
|
|
|
|
SkBudgeted::kNo,
|
|
|
|
SkImageInfo::MakeN32Premul(widthHeight,
|
|
|
|
widthHeight),
|
|
|
|
0,
|
|
|
|
&props,
|
|
|
|
SkGpuDevice::kUninit_InitContents));
|
|
|
|
SkImageFilter::DeviceProxy proxy(device.get());
|
2016-03-07 20:45:14 +00:00
|
|
|
|
|
|
|
(*test)(&proxy, reporter, context);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2016-04-11 18:58:39 +00:00
|
|
|
DEF_TEST(ImageFilterNegativeBlurSigma, reporter) {
|
2016-03-07 20:45:14 +00:00
|
|
|
run_raster_test(reporter, 100, test_negative_blur_sigma);
|
|
|
|
}
|
|
|
|
|
|
|
|
#if SK_SUPPORT_GPU
|
2016-04-12 16:59:58 +00:00
|
|
|
DEF_GPUTEST_FOR_RENDERING_CONTEXTS(ImageFilterNegativeBlurSigma_Gpu, reporter, ctxInfo) {
|
2016-04-05 19:59:06 +00:00
|
|
|
run_gpu_test(reporter, ctxInfo.fGrContext, 100, test_negative_blur_sigma);
|
2014-09-09 16:15:04 +00:00
|
|
|
}
|
2016-03-07 20:45:14 +00:00
|
|
|
#endif
|
2014-09-09 16:15:04 +00:00
|
|
|
|
2016-03-16 23:15:53 +00:00
|
|
|
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)));
|
2016-03-31 16:05:49 +00:00
|
|
|
sk_sp<SkImageFilter> input(SkOffsetImageFilter::Make(0, 0, nullptr, &cropRect));
|
2016-04-04 11:31:25 +00:00
|
|
|
sk_sp<SkImageFilter> filter(SkBlurImageFilter::Make(0, 0, std::move(input), &cropRect));
|
2016-03-16 23:15:53 +00:00
|
|
|
|
2016-03-17 21:31:39 +00:00
|
|
|
sk_sp<SkSpecialSurface> surf(create_empty_special_surface(context, proxy, 10));
|
2016-03-16 23:15:53 +00:00
|
|
|
surf->getCanvas()->clear(SK_ColorGREEN);
|
2016-03-17 21:31:39 +00:00
|
|
|
sk_sp<SkSpecialImage> image(surf->makeImageSnapshot());
|
2016-03-16 23:15:53 +00:00
|
|
|
|
|
|
|
SkIPoint offset;
|
|
|
|
SkImageFilter::Context ctx(SkMatrix::I(), SkIRect::MakeWH(32, 32), nullptr);
|
|
|
|
|
2016-03-24 14:26:32 +00:00
|
|
|
sk_sp<SkSpecialImage> result(filter->filterImage(image.get(), ctx, &offset));
|
2016-03-16 23:15:53 +00:00
|
|
|
REPORTER_ASSERT(reporter, offset.fX == 5 && offset.fY == 0);
|
|
|
|
REPORTER_ASSERT(reporter, result);
|
|
|
|
REPORTER_ASSERT(reporter, result->width() == 5 && result->height() == 10);
|
|
|
|
|
|
|
|
SkBitmap resultBM;
|
|
|
|
|
2016-04-08 19:10:42 +00:00
|
|
|
REPORTER_ASSERT(reporter, result->getROPixels(&resultBM));
|
2016-03-16 23:15:53 +00:00
|
|
|
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-04-11 18:58:39 +00:00
|
|
|
DEF_TEST(ImageFilterZeroBlurSigma, reporter) {
|
2016-03-16 23:15:53 +00:00
|
|
|
run_raster_test(reporter, 100, test_zero_blur_sigma);
|
|
|
|
}
|
|
|
|
|
|
|
|
#if SK_SUPPORT_GPU
|
2016-04-12 16:59:58 +00:00
|
|
|
DEF_GPUTEST_FOR_RENDERING_CONTEXTS(ImageFilterZeroBlurSigma_Gpu, reporter, ctxInfo) {
|
2016-04-05 19:59:06 +00:00
|
|
|
run_gpu_test(reporter, ctxInfo.fGrContext, 100, test_zero_blur_sigma);
|
2016-03-16 23:15:53 +00:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2016-04-05 11:43:45 +00:00
|
|
|
|
|
|
|
// Tests that, even when an upstream filter has returned null (due to failure or clipping), a
|
|
|
|
// downstream filter that affects transparent black still does so even with a nullptr input.
|
|
|
|
static void test_fail_affects_transparent_black(SkImageFilter::Proxy* proxy,
|
|
|
|
skiatest::Reporter* reporter,
|
|
|
|
GrContext* context) {
|
|
|
|
sk_sp<FailImageFilter> failFilter(new FailImageFilter());
|
|
|
|
sk_sp<SkSpecialImage> source(create_empty_special_image(context, proxy, 5));
|
|
|
|
SkImageFilter::Context ctx(SkMatrix::I(), SkIRect::MakeXYWH(0, 0, 1, 1), nullptr);
|
|
|
|
sk_sp<SkColorFilter> green(SkColorFilter::MakeModeFilter(SK_ColorGREEN, SkXfermode::kSrc_Mode));
|
|
|
|
SkASSERT(green->affectsTransparentBlack());
|
2016-04-05 18:50:42 +00:00
|
|
|
sk_sp<SkImageFilter> greenFilter(SkColorFilterImageFilter::Make(std::move(green),
|
|
|
|
std::move(failFilter)));
|
2016-04-05 11:43:45 +00:00
|
|
|
SkIPoint offset;
|
|
|
|
sk_sp<SkSpecialImage> result(greenFilter->filterImage(source.get(), ctx, &offset));
|
|
|
|
REPORTER_ASSERT(reporter, nullptr != result.get());
|
|
|
|
if (result.get()) {
|
|
|
|
SkBitmap resultBM;
|
2016-04-08 19:10:42 +00:00
|
|
|
REPORTER_ASSERT(reporter, result->getROPixels(&resultBM));
|
2016-04-05 11:43:45 +00:00
|
|
|
SkAutoLockPixels lock(resultBM);
|
|
|
|
REPORTER_ASSERT(reporter, *resultBM.getAddr32(0, 0) == SK_ColorGREEN);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
DEF_TEST(ImageFilterFailAffectsTransparentBlack, reporter) {
|
|
|
|
run_raster_test(reporter, 100, test_fail_affects_transparent_black);
|
|
|
|
}
|
|
|
|
|
|
|
|
#if SK_SUPPORT_GPU
|
2016-04-12 16:59:58 +00:00
|
|
|
DEF_GPUTEST_FOR_RENDERING_CONTEXTS(ImageFilterFailAffectsTransparentBlack_Gpu, reporter, ctxInfo) {
|
2016-04-05 19:59:06 +00:00
|
|
|
run_gpu_test(reporter, ctxInfo.fGrContext, 100, test_fail_affects_transparent_black);
|
2016-04-05 11:43:45 +00:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2014-04-29 15:20:39 +00:00
|
|
|
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.
|
|
|
|
// Tests pass by not asserting.
|
|
|
|
|
2016-04-05 16:09:36 +00:00
|
|
|
FilterList filters(nullptr);
|
2014-04-29 15:20:39 +00:00
|
|
|
|
|
|
|
SkBitmap untiledResult, tiledResult;
|
2015-10-06 21:05:32 +00:00
|
|
|
const int width = 64, height = 64;
|
2014-04-29 15:20:39 +00:00
|
|
|
untiledResult.allocN32Pixels(width, height);
|
|
|
|
tiledResult.allocN32Pixels(width, height);
|
|
|
|
SkCanvas tiledCanvas(tiledResult);
|
|
|
|
SkCanvas untiledCanvas(untiledResult);
|
2014-05-07 20:00:04 +00:00
|
|
|
int tileSize = 8;
|
2014-04-29 15:20:39 +00:00
|
|
|
|
2014-05-07 20:00:04 +00:00
|
|
|
for (int scale = 1; scale <= 2; ++scale) {
|
2016-03-23 20:44:26 +00:00
|
|
|
for (int i = 0; i < filters.count(); ++i) {
|
2014-05-07 20:00:04 +00:00
|
|
|
tiledCanvas.clear(0);
|
|
|
|
untiledCanvas.clear(0);
|
|
|
|
SkPaint paint;
|
2016-03-23 20:44:26 +00:00
|
|
|
paint.setImageFilter(filters.getFilter(i));
|
2014-05-07 20:00:04 +00:00
|
|
|
paint.setTextSize(SkIntToScalar(height));
|
|
|
|
paint.setColor(SK_ColorWHITE);
|
|
|
|
SkString str;
|
|
|
|
const char* text = "ABC";
|
|
|
|
SkScalar ypos = SkIntToScalar(height);
|
|
|
|
untiledCanvas.save();
|
|
|
|
untiledCanvas.scale(SkIntToScalar(scale), SkIntToScalar(scale));
|
|
|
|
untiledCanvas.drawText(text, strlen(text), 0, ypos, paint);
|
|
|
|
untiledCanvas.restore();
|
|
|
|
for (int y = 0; y < height; y += tileSize) {
|
|
|
|
for (int x = 0; x < width; x += tileSize) {
|
|
|
|
tiledCanvas.save();
|
|
|
|
tiledCanvas.clipRect(SkRect::Make(SkIRect::MakeXYWH(x, y, tileSize, tileSize)));
|
|
|
|
tiledCanvas.scale(SkIntToScalar(scale), SkIntToScalar(scale));
|
|
|
|
tiledCanvas.drawText(text, strlen(text), 0, ypos, paint);
|
|
|
|
tiledCanvas.restore();
|
|
|
|
}
|
2014-04-29 15:20:39 +00:00
|
|
|
}
|
2014-05-07 20:00:04 +00:00
|
|
|
untiledCanvas.flush();
|
|
|
|
tiledCanvas.flush();
|
|
|
|
for (int y = 0; y < height; y++) {
|
|
|
|
int diffs = memcmp(untiledResult.getAddr32(0, y), tiledResult.getAddr32(0, y), untiledResult.rowBytes());
|
2016-03-23 20:44:26 +00:00
|
|
|
REPORTER_ASSERT_MESSAGE(reporter, !diffs, filters.getName(i));
|
2014-05-07 20:00:04 +00:00
|
|
|
if (diffs) {
|
|
|
|
break;
|
|
|
|
}
|
2014-04-29 15:20:39 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-12-01 19:47:08 +00:00
|
|
|
static void draw_saveLayer_picture(int width, int height, int tileSize,
|
2014-08-29 15:03:56 +00:00
|
|
|
SkBBHFactory* factory, SkBitmap* result) {
|
2014-08-22 16:06:34 +00:00
|
|
|
|
|
|
|
SkMatrix matrix;
|
|
|
|
matrix.setTranslate(SkIntToScalar(50), 0);
|
|
|
|
|
2016-04-05 18:50:42 +00:00
|
|
|
sk_sp<SkColorFilter> cf(SkColorFilter::MakeModeFilter(SK_ColorWHITE, SkXfermode::kSrc_Mode));
|
|
|
|
sk_sp<SkImageFilter> cfif(SkColorFilterImageFilter::Make(std::move(cf), nullptr));
|
2016-04-05 22:09:00 +00:00
|
|
|
sk_sp<SkImageFilter> imageFilter(SkImageFilter::MakeMatrixFilter(matrix,
|
|
|
|
kNone_SkFilterQuality,
|
|
|
|
std::move(cfif)));
|
2014-08-22 16:06:34 +00:00
|
|
|
|
|
|
|
SkPaint paint;
|
2016-04-05 18:50:42 +00:00
|
|
|
paint.setImageFilter(std::move(imageFilter));
|
2014-08-22 16:06:34 +00:00
|
|
|
SkPictureRecorder recorder;
|
|
|
|
SkRect bounds = SkRect::Make(SkIRect::MakeXYWH(0, 0, 50, 50));
|
2014-12-01 19:47:08 +00:00
|
|
|
SkCanvas* recordingCanvas = recorder.beginRecording(SkIntToScalar(width),
|
|
|
|
SkIntToScalar(height),
|
2014-08-29 15:03:56 +00:00
|
|
|
factory, 0);
|
2014-08-22 16:06:34 +00:00
|
|
|
recordingCanvas->translate(-55, 0);
|
|
|
|
recordingCanvas->saveLayer(&bounds, &paint);
|
|
|
|
recordingCanvas->restore();
|
2016-03-18 14:25:55 +00:00
|
|
|
sk_sp<SkPicture> picture1(recorder.finishRecordingAsPicture());
|
2014-08-22 16:06:34 +00:00
|
|
|
|
|
|
|
result->allocN32Pixels(width, height);
|
|
|
|
SkCanvas canvas(*result);
|
|
|
|
canvas.clear(0);
|
|
|
|
canvas.clipRect(SkRect::Make(SkIRect::MakeWH(tileSize, tileSize)));
|
|
|
|
canvas.drawPicture(picture1.get());
|
|
|
|
}
|
|
|
|
|
|
|
|
DEF_TEST(ImageFilterDrawMatrixBBH, reporter) {
|
|
|
|
// Check that matrix filter when drawn tiled with BBH exactly
|
|
|
|
// matches the same thing drawn without BBH.
|
|
|
|
// Tests pass by not asserting.
|
|
|
|
|
|
|
|
const int width = 200, height = 200;
|
|
|
|
const int tileSize = 100;
|
|
|
|
SkBitmap result1, result2;
|
|
|
|
SkRTreeFactory factory;
|
|
|
|
|
2014-08-29 15:03:56 +00:00
|
|
|
draw_saveLayer_picture(width, height, tileSize, &factory, &result1);
|
2015-08-27 14:41:13 +00:00
|
|
|
draw_saveLayer_picture(width, height, tileSize, nullptr, &result2);
|
2014-08-22 16:06:34 +00:00
|
|
|
|
|
|
|
for (int y = 0; y < height; y++) {
|
|
|
|
int diffs = memcmp(result1.getAddr32(0, y), result2.getAddr32(0, y), result1.rowBytes());
|
|
|
|
REPORTER_ASSERT(reporter, !diffs);
|
|
|
|
if (diffs) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-04-04 11:31:25 +00:00
|
|
|
static sk_sp<SkImageFilter> make_blur(sk_sp<SkImageFilter> input) {
|
|
|
|
return SkBlurImageFilter::Make(SK_Scalar1, SK_Scalar1, std::move(input));
|
2014-08-25 19:46:58 +00:00
|
|
|
}
|
|
|
|
|
2016-04-04 11:31:25 +00:00
|
|
|
static sk_sp<SkImageFilter> make_drop_shadow(sk_sp<SkImageFilter> input) {
|
2016-04-06 15:40:59 +00:00
|
|
|
return SkDropShadowImageFilter::Make(
|
2014-08-25 19:46:58 +00:00
|
|
|
SkIntToScalar(100), SkIntToScalar(100),
|
|
|
|
SkIntToScalar(10), SkIntToScalar(10),
|
2014-10-23 20:59:52 +00:00
|
|
|
SK_ColorBLUE, SkDropShadowImageFilter::kDrawShadowAndForeground_ShadowMode,
|
2016-04-06 15:40:59 +00:00
|
|
|
std::move(input));
|
2014-08-25 19:46:58 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
DEF_TEST(ImageFilterBlurThenShadowBounds, reporter) {
|
2016-04-04 11:31:25 +00:00
|
|
|
sk_sp<SkImageFilter> filter1(make_blur(nullptr));
|
|
|
|
sk_sp<SkImageFilter> filter2(make_drop_shadow(std::move(filter1)));
|
2014-08-25 19:46:58 +00:00
|
|
|
|
|
|
|
SkIRect bounds = SkIRect::MakeXYWH(0, 0, 100, 100);
|
|
|
|
SkIRect expectedBounds = SkIRect::MakeXYWH(-133, -133, 236, 236);
|
2016-03-21 21:51:59 +00:00
|
|
|
bounds = filter2->filterBounds(bounds, SkMatrix::I());
|
2014-08-25 19:46:58 +00:00
|
|
|
|
|
|
|
REPORTER_ASSERT(reporter, bounds == expectedBounds);
|
|
|
|
}
|
|
|
|
|
|
|
|
DEF_TEST(ImageFilterShadowThenBlurBounds, reporter) {
|
2016-04-04 11:31:25 +00:00
|
|
|
sk_sp<SkImageFilter> filter1(make_drop_shadow(nullptr));
|
|
|
|
sk_sp<SkImageFilter> filter2(make_blur(std::move(filter1)));
|
2014-08-25 19:46:58 +00:00
|
|
|
|
|
|
|
SkIRect bounds = SkIRect::MakeXYWH(0, 0, 100, 100);
|
|
|
|
SkIRect expectedBounds = SkIRect::MakeXYWH(-133, -133, 236, 236);
|
2016-03-21 21:51:59 +00:00
|
|
|
bounds = filter2->filterBounds(bounds, SkMatrix::I());
|
2014-08-25 19:46:58 +00:00
|
|
|
|
|
|
|
REPORTER_ASSERT(reporter, bounds == expectedBounds);
|
|
|
|
}
|
|
|
|
|
|
|
|
DEF_TEST(ImageFilterDilateThenBlurBounds, reporter) {
|
2016-04-05 16:09:36 +00:00
|
|
|
sk_sp<SkImageFilter> filter1(SkDilateImageFilter::Make(2, 2, nullptr));
|
2016-04-04 11:31:25 +00:00
|
|
|
sk_sp<SkImageFilter> filter2(make_drop_shadow(std::move(filter1)));
|
2014-08-25 19:46:58 +00:00
|
|
|
|
|
|
|
SkIRect bounds = SkIRect::MakeXYWH(0, 0, 100, 100);
|
|
|
|
SkIRect expectedBounds = SkIRect::MakeXYWH(-132, -132, 234, 234);
|
2016-03-21 21:51:59 +00:00
|
|
|
bounds = filter2->filterBounds(bounds, SkMatrix::I());
|
2014-08-25 19:46:58 +00:00
|
|
|
|
|
|
|
REPORTER_ASSERT(reporter, bounds == expectedBounds);
|
|
|
|
}
|
|
|
|
|
2015-02-13 17:05:47 +00:00
|
|
|
DEF_TEST(ImageFilterComposedBlurFastBounds, reporter) {
|
2016-04-04 11:31:25 +00:00
|
|
|
sk_sp<SkImageFilter> filter1(make_blur(nullptr));
|
|
|
|
sk_sp<SkImageFilter> filter2(make_blur(nullptr));
|
2016-03-30 19:32:58 +00:00
|
|
|
sk_sp<SkImageFilter> composedFilter(SkComposeImageFilter::Make(std::move(filter1),
|
|
|
|
std::move(filter2)));
|
2015-02-13 17:05:47 +00:00
|
|
|
|
|
|
|
SkRect boundsSrc = SkRect::MakeWH(SkIntToScalar(100), SkIntToScalar(100));
|
|
|
|
SkRect expectedBounds = SkRect::MakeXYWH(
|
|
|
|
SkIntToScalar(-6), SkIntToScalar(-6), SkIntToScalar(112), SkIntToScalar(112));
|
2016-03-21 21:51:59 +00:00
|
|
|
SkRect boundsDst = composedFilter->computeFastBounds(boundsSrc);
|
2015-02-13 17:05:47 +00:00
|
|
|
|
|
|
|
REPORTER_ASSERT(reporter, boundsDst == expectedBounds);
|
|
|
|
}
|
|
|
|
|
2016-03-17 19:24:23 +00:00
|
|
|
DEF_TEST(ImageFilterUnionBounds, reporter) {
|
2016-03-31 16:05:49 +00:00
|
|
|
sk_sp<SkImageFilter> offset(SkOffsetImageFilter::Make(50, 0, nullptr));
|
2016-03-17 19:24:23 +00:00
|
|
|
// Regardless of which order they appear in, the image filter bounds should
|
|
|
|
// be combined correctly.
|
|
|
|
{
|
2016-04-05 19:48:34 +00:00
|
|
|
sk_sp<SkImageFilter> composite(SkXfermodeImageFilter::Make(nullptr, offset));
|
2016-03-17 19:24:23 +00:00
|
|
|
SkRect bounds = SkRect::MakeWH(100, 100);
|
|
|
|
// Intentionally aliasing here, as that's what the real callers do.
|
2016-03-21 21:51:59 +00:00
|
|
|
bounds = composite->computeFastBounds(bounds);
|
2016-03-17 19:24:23 +00:00
|
|
|
REPORTER_ASSERT(reporter, bounds == SkRect::MakeWH(150, 100));
|
|
|
|
}
|
|
|
|
{
|
2016-03-29 18:32:50 +00:00
|
|
|
sk_sp<SkImageFilter> composite(SkXfermodeImageFilter::Make(nullptr, nullptr,
|
2016-04-05 19:48:34 +00:00
|
|
|
offset, nullptr));
|
2016-03-17 19:24:23 +00:00
|
|
|
SkRect bounds = SkRect::MakeWH(100, 100);
|
|
|
|
// Intentionally aliasing here, as that's what the real callers do.
|
2016-03-21 21:51:59 +00:00
|
|
|
bounds = composite->computeFastBounds(bounds);
|
2016-03-17 19:24:23 +00:00
|
|
|
REPORTER_ASSERT(reporter, bounds == SkRect::MakeWH(150, 100));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-03-07 20:45:14 +00:00
|
|
|
static void test_imagefilter_merge_result_size(SkImageFilter::Proxy* proxy,
|
|
|
|
skiatest::Reporter* reporter,
|
|
|
|
GrContext* context) {
|
2015-11-25 15:06:55 +00:00
|
|
|
SkBitmap greenBM;
|
|
|
|
greenBM.allocN32Pixels(20, 20);
|
|
|
|
greenBM.eraseColor(SK_ColorGREEN);
|
2016-03-17 17:51:11 +00:00
|
|
|
sk_sp<SkImage> greenImage(SkImage::MakeFromBitmap(greenBM));
|
2016-04-01 16:28:51 +00:00
|
|
|
sk_sp<SkImageFilter> source(SkImageSource::Make(std::move(greenImage)));
|
2016-03-30 20:34:16 +00:00
|
|
|
sk_sp<SkImageFilter> merge(SkMergeImageFilter::Make(source, source));
|
2015-11-25 15:06:55 +00:00
|
|
|
|
2016-03-17 21:31:39 +00:00
|
|
|
sk_sp<SkSpecialImage> srcImg(create_empty_special_image(context, proxy, 1));
|
2016-03-07 20:45:14 +00:00
|
|
|
|
2016-01-11 18:56:59 +00:00
|
|
|
SkImageFilter::Context ctx(SkMatrix::I(), SkIRect::MakeXYWH(0, 0, 100, 100), nullptr);
|
2015-11-25 15:06:55 +00:00
|
|
|
SkIPoint offset;
|
2016-03-07 20:45:14 +00:00
|
|
|
|
2016-03-24 14:26:32 +00:00
|
|
|
sk_sp<SkSpecialImage> resultImg(merge->filterImage(srcImg.get(), ctx, &offset));
|
2016-03-07 20:45:14 +00:00
|
|
|
REPORTER_ASSERT(reporter, resultImg);
|
|
|
|
|
|
|
|
REPORTER_ASSERT(reporter, resultImg->width() == 20 && resultImg->height() == 20);
|
|
|
|
}
|
|
|
|
|
|
|
|
DEF_TEST(ImageFilterMergeResultSize, reporter) {
|
|
|
|
run_raster_test(reporter, 100, test_imagefilter_merge_result_size);
|
|
|
|
}
|
|
|
|
|
|
|
|
#if SK_SUPPORT_GPU
|
2016-04-06 21:02:39 +00:00
|
|
|
DEF_GPUTEST_FOR_GL_RENDERING_CONTEXTS(ImageFilterMergeResultSize_Gpu, reporter, ctxInfo) {
|
2016-04-05 19:59:06 +00:00
|
|
|
run_gpu_test(reporter, ctxInfo.fGrContext, 100, test_imagefilter_merge_result_size);
|
2015-11-25 15:06:55 +00:00
|
|
|
}
|
2016-03-07 20:45:14 +00:00
|
|
|
#endif
|
2015-11-25 15:06:55 +00:00
|
|
|
|
2014-08-29 15:03:56 +00:00
|
|
|
static void draw_blurred_rect(SkCanvas* canvas) {
|
2014-07-14 17:19:54 +00:00
|
|
|
SkPaint filterPaint;
|
|
|
|
filterPaint.setColor(SK_ColorWHITE);
|
2016-04-04 11:31:25 +00:00
|
|
|
filterPaint.setImageFilter(SkBlurImageFilter::Make(SkIntToScalar(8), 0, nullptr));
|
2015-08-27 14:41:13 +00:00
|
|
|
canvas->saveLayer(nullptr, &filterPaint);
|
2014-07-14 17:19:54 +00:00
|
|
|
SkPaint whitePaint;
|
|
|
|
whitePaint.setColor(SK_ColorWHITE);
|
|
|
|
canvas->drawRect(SkRect::Make(SkIRect::MakeWH(4, 4)), whitePaint);
|
|
|
|
canvas->restore();
|
|
|
|
}
|
|
|
|
|
2014-08-29 15:03:56 +00:00
|
|
|
static void draw_picture_clipped(SkCanvas* canvas, const SkRect& clipRect, const SkPicture* picture) {
|
2014-07-14 17:19:54 +00:00
|
|
|
canvas->save();
|
|
|
|
canvas->clipRect(clipRect);
|
|
|
|
canvas->drawPicture(picture);
|
|
|
|
canvas->restore();
|
|
|
|
}
|
|
|
|
|
|
|
|
DEF_TEST(ImageFilterDrawTiledBlurRTree, reporter) {
|
|
|
|
// Check that the blur filter when recorded with RTree acceleration,
|
|
|
|
// and drawn tiled (with subsequent clip rects) exactly
|
|
|
|
// matches the same filter drawn with without RTree acceleration.
|
|
|
|
// This tests that the "bleed" from the blur into the otherwise-blank
|
|
|
|
// tiles is correctly rendered.
|
|
|
|
// Tests pass by not asserting.
|
|
|
|
|
|
|
|
int width = 16, height = 8;
|
|
|
|
SkBitmap result1, result2;
|
|
|
|
result1.allocN32Pixels(width, height);
|
|
|
|
result2.allocN32Pixels(width, height);
|
|
|
|
SkCanvas canvas1(result1);
|
|
|
|
SkCanvas canvas2(result2);
|
|
|
|
int tileSize = 8;
|
|
|
|
|
|
|
|
canvas1.clear(0);
|
|
|
|
canvas2.clear(0);
|
|
|
|
|
|
|
|
SkRTreeFactory factory;
|
|
|
|
|
|
|
|
SkPictureRecorder recorder1, recorder2;
|
|
|
|
// The only difference between these two pictures is that one has RTree aceleration.
|
2014-12-01 19:47:08 +00:00
|
|
|
SkCanvas* recordingCanvas1 = recorder1.beginRecording(SkIntToScalar(width),
|
|
|
|
SkIntToScalar(height),
|
2015-08-27 14:41:13 +00:00
|
|
|
nullptr, 0);
|
2014-12-01 19:47:08 +00:00
|
|
|
SkCanvas* recordingCanvas2 = recorder2.beginRecording(SkIntToScalar(width),
|
|
|
|
SkIntToScalar(height),
|
2014-08-29 15:03:56 +00:00
|
|
|
&factory, 0);
|
|
|
|
draw_blurred_rect(recordingCanvas1);
|
|
|
|
draw_blurred_rect(recordingCanvas2);
|
2016-03-18 14:25:55 +00:00
|
|
|
sk_sp<SkPicture> picture1(recorder1.finishRecordingAsPicture());
|
|
|
|
sk_sp<SkPicture> picture2(recorder2.finishRecordingAsPicture());
|
2014-07-14 17:19:54 +00:00
|
|
|
for (int y = 0; y < height; y += tileSize) {
|
|
|
|
for (int x = 0; x < width; x += tileSize) {
|
|
|
|
SkRect tileRect = SkRect::Make(SkIRect::MakeXYWH(x, y, tileSize, tileSize));
|
2016-03-18 14:25:55 +00:00
|
|
|
draw_picture_clipped(&canvas1, tileRect, picture1.get());
|
|
|
|
draw_picture_clipped(&canvas2, tileRect, picture2.get());
|
2014-07-14 17:19:54 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
for (int y = 0; y < height; y++) {
|
|
|
|
int diffs = memcmp(result1.getAddr32(0, y), result2.getAddr32(0, y), result1.rowBytes());
|
|
|
|
REPORTER_ASSERT(reporter, !diffs);
|
|
|
|
if (diffs) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-05-01 14:03:41 +00:00
|
|
|
DEF_TEST(ImageFilterMatrixConvolution, reporter) {
|
|
|
|
// Check that a 1x3 filter does not cause a spurious assert.
|
|
|
|
SkScalar kernel[3] = {
|
|
|
|
SkIntToScalar( 1), SkIntToScalar( 1), SkIntToScalar( 1),
|
|
|
|
};
|
|
|
|
SkISize kernelSize = SkISize::Make(1, 3);
|
|
|
|
SkScalar gain = SK_Scalar1, bias = 0;
|
|
|
|
SkIPoint kernelOffset = SkIPoint::Make(0, 0);
|
|
|
|
|
2016-04-08 15:01:20 +00:00
|
|
|
sk_sp<SkImageFilter> filter(SkMatrixConvolutionImageFilter::Make(
|
|
|
|
kernelSize, kernel,
|
|
|
|
gain, bias, kernelOffset,
|
|
|
|
SkMatrixConvolutionImageFilter::kRepeat_TileMode,
|
|
|
|
false, nullptr));
|
2014-05-01 14:03:41 +00:00
|
|
|
|
|
|
|
SkBitmap result;
|
|
|
|
int width = 16, height = 16;
|
|
|
|
result.allocN32Pixels(width, height);
|
|
|
|
SkCanvas canvas(result);
|
|
|
|
canvas.clear(0);
|
|
|
|
|
|
|
|
SkPaint paint;
|
2016-04-08 15:01:20 +00:00
|
|
|
paint.setImageFilter(std::move(filter));
|
2014-05-01 14:03:41 +00:00
|
|
|
SkRect rect = SkRect::Make(SkIRect::MakeWH(width, height));
|
|
|
|
canvas.drawRect(rect, paint);
|
|
|
|
}
|
|
|
|
|
2014-05-02 19:13:11 +00:00
|
|
|
DEF_TEST(ImageFilterMatrixConvolutionBorder, reporter) {
|
|
|
|
// Check that a filter with borders outside the target bounds
|
|
|
|
// does not crash.
|
|
|
|
SkScalar kernel[3] = {
|
|
|
|
0, 0, 0,
|
|
|
|
};
|
|
|
|
SkISize kernelSize = SkISize::Make(3, 1);
|
|
|
|
SkScalar gain = SK_Scalar1, bias = 0;
|
|
|
|
SkIPoint kernelOffset = SkIPoint::Make(2, 0);
|
|
|
|
|
2016-04-08 15:01:20 +00:00
|
|
|
sk_sp<SkImageFilter> filter(SkMatrixConvolutionImageFilter::Make(
|
|
|
|
kernelSize, kernel, gain, bias, kernelOffset,
|
|
|
|
SkMatrixConvolutionImageFilter::kClamp_TileMode,
|
|
|
|
true, nullptr));
|
2014-05-02 19:13:11 +00:00
|
|
|
|
|
|
|
SkBitmap result;
|
|
|
|
|
|
|
|
int width = 10, height = 10;
|
|
|
|
result.allocN32Pixels(width, height);
|
|
|
|
SkCanvas canvas(result);
|
|
|
|
canvas.clear(0);
|
|
|
|
|
|
|
|
SkPaint filterPaint;
|
2016-04-08 15:01:20 +00:00
|
|
|
filterPaint.setImageFilter(std::move(filter));
|
2014-05-02 19:13:11 +00:00
|
|
|
SkRect bounds = SkRect::MakeWH(1, 10);
|
|
|
|
SkRect rect = SkRect::Make(SkIRect::MakeWH(width, height));
|
|
|
|
SkPaint rectPaint;
|
|
|
|
canvas.saveLayer(&bounds, &filterPaint);
|
|
|
|
canvas.drawRect(rect, rectPaint);
|
|
|
|
canvas.restore();
|
|
|
|
}
|
|
|
|
|
2016-04-13 11:54:36 +00:00
|
|
|
static void test_big_kernel(SkImageFilter::Proxy* proxy,
|
|
|
|
skiatest::Reporter* reporter,
|
|
|
|
GrContext* context) {
|
|
|
|
// Check that a kernel that is too big for the GPU still works
|
|
|
|
SkScalar identityKernel[49] = {
|
|
|
|
0, 0, 0, 0, 0, 0, 0,
|
|
|
|
0, 0, 0, 0, 0, 0, 0,
|
|
|
|
0, 0, 0, 0, 0, 0, 0,
|
|
|
|
0, 0, 0, 1, 0, 0, 0,
|
|
|
|
0, 0, 0, 0, 0, 0, 0,
|
|
|
|
0, 0, 0, 0, 0, 0, 0,
|
|
|
|
0, 0, 0, 0, 0, 0, 0
|
|
|
|
};
|
|
|
|
SkISize kernelSize = SkISize::Make(7, 7);
|
|
|
|
SkScalar gain = SK_Scalar1, bias = 0;
|
|
|
|
SkIPoint kernelOffset = SkIPoint::Make(0, 0);
|
|
|
|
|
|
|
|
sk_sp<SkImageFilter> filter(SkMatrixConvolutionImageFilter::Make(
|
|
|
|
kernelSize, identityKernel, gain, bias, kernelOffset,
|
|
|
|
SkMatrixConvolutionImageFilter::kClamp_TileMode,
|
|
|
|
true, nullptr));
|
|
|
|
|
|
|
|
sk_sp<SkSpecialImage> srcImg(create_empty_special_image(context, proxy, 100));
|
|
|
|
SkASSERT(srcImg);
|
|
|
|
|
|
|
|
SkIPoint offset;
|
|
|
|
SkImageFilter::Context ctx(SkMatrix::I(), SkIRect::MakeWH(100, 100), nullptr);
|
|
|
|
sk_sp<SkSpecialImage> resultImg(filter->filterImage(srcImg.get(), ctx, &offset));
|
|
|
|
REPORTER_ASSERT(reporter, resultImg);
|
|
|
|
REPORTER_ASSERT(reporter, SkToBool(context) == resultImg->isTextureBacked());
|
|
|
|
REPORTER_ASSERT(reporter, resultImg->width() == 100 && resultImg->height() == 100);
|
|
|
|
REPORTER_ASSERT(reporter, offset.fX == 0 && offset.fY == 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
DEF_TEST(ImageFilterMatrixConvolutionBigKernel, reporter) {
|
|
|
|
run_raster_test(reporter, 100, test_big_kernel);
|
|
|
|
}
|
|
|
|
|
|
|
|
#if SK_SUPPORT_GPU
|
|
|
|
DEF_GPUTEST_FOR_GL_RENDERING_CONTEXTS(ImageFilterMatrixConvolutionBigKernel_Gpu,
|
|
|
|
reporter, ctxInfo) {
|
|
|
|
run_gpu_test(reporter, ctxInfo.fGrContext, 100, test_big_kernel);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2014-02-03 22:22:16 +00:00
|
|
|
DEF_TEST(ImageFilterCropRect, reporter) {
|
2016-03-07 20:45:14 +00:00
|
|
|
run_raster_test(reporter, 100, test_crop_rects);
|
|
|
|
}
|
2015-06-22 16:46:59 +00:00
|
|
|
|
2016-03-07 20:45:14 +00:00
|
|
|
#if SK_SUPPORT_GPU
|
2016-04-12 16:59:58 +00:00
|
|
|
DEF_GPUTEST_FOR_RENDERING_CONTEXTS(ImageFilterCropRect_Gpu, reporter, ctxInfo) {
|
2016-04-05 19:59:06 +00:00
|
|
|
run_gpu_test(reporter, ctxInfo.fGrContext, 100, test_crop_rects);
|
2014-02-03 22:22:16 +00:00
|
|
|
}
|
2016-03-07 20:45:14 +00:00
|
|
|
#endif
|
2014-02-03 22:22:16 +00:00
|
|
|
|
2014-06-24 13:50:39 +00:00
|
|
|
DEF_TEST(ImageFilterMatrix, reporter) {
|
2014-02-05 22:36:31 +00:00
|
|
|
SkBitmap temp;
|
2014-02-13 14:41:43 +00:00
|
|
|
temp.allocN32Pixels(100, 100);
|
2015-06-22 16:46:59 +00:00
|
|
|
SkCanvas canvas(temp);
|
2014-02-05 22:36:31 +00:00
|
|
|
canvas.scale(SkIntToScalar(2), SkIntToScalar(2));
|
|
|
|
|
|
|
|
SkMatrix expectedMatrix = canvas.getTotalMatrix();
|
|
|
|
|
2014-04-17 23:35:06 +00:00
|
|
|
SkRTreeFactory factory;
|
|
|
|
SkPictureRecorder recorder;
|
|
|
|
SkCanvas* recordingCanvas = recorder.beginRecording(100, 100, &factory, 0);
|
2014-02-05 22:36:31 +00:00
|
|
|
|
|
|
|
SkPaint paint;
|
2016-04-04 12:05:11 +00:00
|
|
|
paint.setImageFilter(MatrixTestImageFilter::Make(reporter, expectedMatrix));
|
2015-08-27 14:41:13 +00:00
|
|
|
recordingCanvas->saveLayer(nullptr, &paint);
|
2014-02-05 22:36:31 +00:00
|
|
|
SkPaint solidPaint;
|
|
|
|
solidPaint.setColor(0xFFFFFFFF);
|
|
|
|
recordingCanvas->save();
|
|
|
|
recordingCanvas->scale(SkIntToScalar(10), SkIntToScalar(10));
|
|
|
|
recordingCanvas->drawRect(SkRect::Make(SkIRect::MakeWH(100, 100)), solidPaint);
|
|
|
|
recordingCanvas->restore(); // scale
|
|
|
|
recordingCanvas->restore(); // saveLayer
|
|
|
|
|
2016-03-18 14:25:55 +00:00
|
|
|
canvas.drawPicture(recorder.finishRecordingAsPicture());
|
2014-02-05 22:36:31 +00:00
|
|
|
}
|
|
|
|
|
2014-07-30 21:49:31 +00:00
|
|
|
DEF_TEST(ImageFilterCrossProcessPictureImageFilter, reporter) {
|
2014-05-30 20:50:56 +00:00
|
|
|
SkRTreeFactory factory;
|
|
|
|
SkPictureRecorder recorder;
|
|
|
|
SkCanvas* recordingCanvas = recorder.beginRecording(1, 1, &factory, 0);
|
|
|
|
|
|
|
|
// Create an SkPicture which simply draws a green 1x1 rectangle.
|
|
|
|
SkPaint greenPaint;
|
|
|
|
greenPaint.setColor(SK_ColorGREEN);
|
|
|
|
recordingCanvas->drawRect(SkRect::Make(SkIRect::MakeWH(1, 1)), greenPaint);
|
2016-03-18 14:25:55 +00:00
|
|
|
sk_sp<SkPicture> picture(recorder.finishRecordingAsPicture());
|
2014-05-30 20:50:56 +00:00
|
|
|
|
|
|
|
// Wrap that SkPicture in an SkPictureImageFilter.
|
2016-03-28 20:13:42 +00:00
|
|
|
sk_sp<SkImageFilter> imageFilter(SkPictureImageFilter::Make(picture));
|
2014-05-30 20:50:56 +00:00
|
|
|
|
|
|
|
// Check that SkPictureImageFilter successfully serializes its contained
|
|
|
|
// SkPicture when not in cross-process mode.
|
|
|
|
SkPaint paint;
|
2016-03-28 20:13:42 +00:00
|
|
|
paint.setImageFilter(imageFilter);
|
2014-05-30 20:50:56 +00:00
|
|
|
SkPictureRecorder outerRecorder;
|
|
|
|
SkCanvas* outerCanvas = outerRecorder.beginRecording(1, 1, &factory, 0);
|
|
|
|
SkPaint redPaintWithFilter;
|
|
|
|
redPaintWithFilter.setColor(SK_ColorRED);
|
2016-03-28 20:13:42 +00:00
|
|
|
redPaintWithFilter.setImageFilter(imageFilter);
|
2014-05-30 20:50:56 +00:00
|
|
|
outerCanvas->drawRect(SkRect::Make(SkIRect::MakeWH(1, 1)), redPaintWithFilter);
|
2016-03-18 14:25:55 +00:00
|
|
|
sk_sp<SkPicture> outerPicture(outerRecorder.finishRecordingAsPicture());
|
2014-05-30 20:50:56 +00:00
|
|
|
|
|
|
|
SkBitmap bitmap;
|
|
|
|
bitmap.allocN32Pixels(1, 1);
|
2015-06-22 16:46:59 +00:00
|
|
|
SkCanvas canvas(bitmap);
|
2014-05-30 20:50:56 +00:00
|
|
|
|
|
|
|
// The result here should be green, since the filter replaces the primitive's red interior.
|
|
|
|
canvas.clear(0x0);
|
2014-06-04 12:40:44 +00:00
|
|
|
canvas.drawPicture(outerPicture);
|
2014-05-30 20:50:56 +00:00
|
|
|
uint32_t pixel = *bitmap.getAddr32(0, 0);
|
|
|
|
REPORTER_ASSERT(reporter, pixel == SK_ColorGREEN);
|
|
|
|
|
|
|
|
// Check that, for now, SkPictureImageFilter does not serialize or
|
|
|
|
// deserialize its contained picture when the filter is serialized
|
|
|
|
// cross-process. Do this by "laundering" it through SkValidatingReadBuffer.
|
2016-04-08 23:28:09 +00:00
|
|
|
sk_sp<SkData> data(SkValidatingSerializeFlattenable(imageFilter.get()));
|
|
|
|
sk_sp<SkFlattenable> flattenable(SkValidatingDeserializeFlattenable(
|
2016-04-04 21:57:19 +00:00
|
|
|
data->data(), data->size(), SkImageFilter::GetFlattenableType()));
|
2014-05-30 20:50:56 +00:00
|
|
|
SkImageFilter* unflattenedFilter = static_cast<SkImageFilter*>(flattenable.get());
|
|
|
|
|
|
|
|
redPaintWithFilter.setImageFilter(unflattenedFilter);
|
|
|
|
SkPictureRecorder crossProcessRecorder;
|
|
|
|
SkCanvas* crossProcessCanvas = crossProcessRecorder.beginRecording(1, 1, &factory, 0);
|
|
|
|
crossProcessCanvas->drawRect(SkRect::Make(SkIRect::MakeWH(1, 1)), redPaintWithFilter);
|
2016-03-18 14:25:55 +00:00
|
|
|
sk_sp<SkPicture> crossProcessPicture(crossProcessRecorder.finishRecordingAsPicture());
|
2014-05-30 20:50:56 +00:00
|
|
|
|
|
|
|
canvas.clear(0x0);
|
2014-06-04 12:40:44 +00:00
|
|
|
canvas.drawPicture(crossProcessPicture);
|
2014-05-30 20:50:56 +00:00
|
|
|
pixel = *bitmap.getAddr32(0, 0);
|
2015-06-16 16:28:37 +00:00
|
|
|
// If the security precautions are enabled, the result here should not be green, since the
|
|
|
|
// filter draws nothing.
|
2016-02-07 20:23:10 +00:00
|
|
|
REPORTER_ASSERT(reporter, SkPicture::PictureIOSecurityPrecautionsEnabled()
|
2015-06-16 16:28:37 +00:00
|
|
|
? pixel != SK_ColorGREEN : pixel == SK_ColorGREEN);
|
2014-05-30 20:50:56 +00:00
|
|
|
}
|
|
|
|
|
2016-03-07 20:45:14 +00:00
|
|
|
static void test_clipped_picture_imagefilter(SkImageFilter::Proxy* proxy,
|
|
|
|
skiatest::Reporter* reporter,
|
|
|
|
GrContext* context) {
|
2016-03-18 14:25:55 +00:00
|
|
|
sk_sp<SkPicture> picture;
|
2014-07-30 21:49:31 +00:00
|
|
|
|
2016-03-07 20:45:14 +00:00
|
|
|
{
|
|
|
|
SkRTreeFactory factory;
|
|
|
|
SkPictureRecorder recorder;
|
|
|
|
SkCanvas* recordingCanvas = recorder.beginRecording(1, 1, &factory, 0);
|
|
|
|
|
|
|
|
// Create an SkPicture which simply draws a green 1x1 rectangle.
|
|
|
|
SkPaint greenPaint;
|
|
|
|
greenPaint.setColor(SK_ColorGREEN);
|
|
|
|
recordingCanvas->drawRect(SkRect::Make(SkIRect::MakeWH(1, 1)), greenPaint);
|
2016-03-18 14:25:55 +00:00
|
|
|
picture = recorder.finishRecordingAsPicture();
|
2016-03-07 20:45:14 +00:00
|
|
|
}
|
|
|
|
|
2016-03-17 21:31:39 +00:00
|
|
|
sk_sp<SkSpecialImage> srcImg(create_empty_special_image(context, proxy, 2));
|
2014-07-30 21:49:31 +00:00
|
|
|
|
2016-03-28 20:13:42 +00:00
|
|
|
sk_sp<SkImageFilter> imageFilter(SkPictureImageFilter::Make(picture));
|
2014-07-30 21:49:31 +00:00
|
|
|
|
|
|
|
SkIPoint offset;
|
2016-01-11 18:56:59 +00:00
|
|
|
SkImageFilter::Context ctx(SkMatrix::I(), SkIRect::MakeXYWH(1, 1, 1, 1), nullptr);
|
2016-03-07 20:45:14 +00:00
|
|
|
|
2016-03-24 14:26:32 +00:00
|
|
|
sk_sp<SkSpecialImage> resultImage(imageFilter->filterImage(srcImg.get(), ctx, &offset));
|
2016-03-07 20:45:14 +00:00
|
|
|
REPORTER_ASSERT(reporter, !resultImage);
|
|
|
|
}
|
|
|
|
|
|
|
|
DEF_TEST(ImageFilterClippedPictureImageFilter, reporter) {
|
|
|
|
run_raster_test(reporter, 2, test_clipped_picture_imagefilter);
|
|
|
|
}
|
|
|
|
|
|
|
|
#if SK_SUPPORT_GPU
|
2016-04-12 16:59:58 +00:00
|
|
|
DEF_GPUTEST_FOR_RENDERING_CONTEXTS(ImageFilterClippedPictureImageFilter_Gpu, reporter, ctxInfo) {
|
2016-04-05 19:59:06 +00:00
|
|
|
run_gpu_test(reporter, ctxInfo.fGrContext, 2, test_clipped_picture_imagefilter);
|
2014-07-30 21:49:31 +00:00
|
|
|
}
|
2016-03-07 20:45:14 +00:00
|
|
|
#endif
|
2014-07-30 21:49:31 +00:00
|
|
|
|
2014-06-24 13:50:39 +00:00
|
|
|
DEF_TEST(ImageFilterEmptySaveLayer, reporter) {
|
2014-05-06 22:52:55 +00:00
|
|
|
// Even when there's an empty saveLayer()/restore(), ensure that an image
|
|
|
|
// filter or color filter which affects transparent black still draws.
|
|
|
|
|
|
|
|
SkBitmap bitmap;
|
|
|
|
bitmap.allocN32Pixels(10, 10);
|
2015-06-22 16:46:59 +00:00
|
|
|
SkCanvas canvas(bitmap);
|
2014-05-06 22:52:55 +00:00
|
|
|
|
|
|
|
SkRTreeFactory factory;
|
|
|
|
SkPictureRecorder recorder;
|
|
|
|
|
2016-04-05 18:50:42 +00:00
|
|
|
sk_sp<SkColorFilter> green(SkColorFilter::MakeModeFilter(SK_ColorGREEN,
|
|
|
|
SkXfermode::kSrc_Mode));
|
|
|
|
sk_sp<SkImageFilter> imageFilter(SkColorFilterImageFilter::Make(green, nullptr));
|
2014-05-06 22:52:55 +00:00
|
|
|
SkPaint imageFilterPaint;
|
2016-04-05 18:50:42 +00:00
|
|
|
imageFilterPaint.setImageFilter(std::move(imageFilter));
|
2014-05-06 22:52:55 +00:00
|
|
|
SkPaint colorFilterPaint;
|
2016-03-22 17:17:23 +00:00
|
|
|
colorFilterPaint.setColorFilter(green);
|
2014-05-06 22:52:55 +00:00
|
|
|
|
|
|
|
SkRect bounds = SkRect::MakeWH(10, 10);
|
|
|
|
|
|
|
|
SkCanvas* recordingCanvas = recorder.beginRecording(10, 10, &factory, 0);
|
|
|
|
recordingCanvas->saveLayer(&bounds, &imageFilterPaint);
|
|
|
|
recordingCanvas->restore();
|
2016-03-18 14:25:55 +00:00
|
|
|
sk_sp<SkPicture> picture(recorder.finishRecordingAsPicture());
|
2014-05-06 22:52:55 +00:00
|
|
|
|
|
|
|
canvas.clear(0);
|
2014-06-04 12:40:44 +00:00
|
|
|
canvas.drawPicture(picture);
|
2014-05-06 22:52:55 +00:00
|
|
|
uint32_t pixel = *bitmap.getAddr32(0, 0);
|
|
|
|
REPORTER_ASSERT(reporter, pixel == SK_ColorGREEN);
|
|
|
|
|
|
|
|
recordingCanvas = recorder.beginRecording(10, 10, &factory, 0);
|
2015-08-27 14:41:13 +00:00
|
|
|
recordingCanvas->saveLayer(nullptr, &imageFilterPaint);
|
2014-05-06 22:52:55 +00:00
|
|
|
recordingCanvas->restore();
|
2016-03-18 14:25:55 +00:00
|
|
|
sk_sp<SkPicture> picture2(recorder.finishRecordingAsPicture());
|
2014-05-06 22:52:55 +00:00
|
|
|
|
|
|
|
canvas.clear(0);
|
2014-06-04 12:40:44 +00:00
|
|
|
canvas.drawPicture(picture2);
|
2014-05-06 22:52:55 +00:00
|
|
|
pixel = *bitmap.getAddr32(0, 0);
|
|
|
|
REPORTER_ASSERT(reporter, pixel == SK_ColorGREEN);
|
|
|
|
|
|
|
|
recordingCanvas = recorder.beginRecording(10, 10, &factory, 0);
|
|
|
|
recordingCanvas->saveLayer(&bounds, &colorFilterPaint);
|
|
|
|
recordingCanvas->restore();
|
2016-03-18 14:25:55 +00:00
|
|
|
sk_sp<SkPicture> picture3(recorder.finishRecordingAsPicture());
|
2014-05-06 22:52:55 +00:00
|
|
|
|
|
|
|
canvas.clear(0);
|
2014-06-04 12:40:44 +00:00
|
|
|
canvas.drawPicture(picture3);
|
2014-05-06 22:52:55 +00:00
|
|
|
pixel = *bitmap.getAddr32(0, 0);
|
|
|
|
REPORTER_ASSERT(reporter, pixel == SK_ColorGREEN);
|
|
|
|
}
|
|
|
|
|
2015-06-22 16:46:59 +00:00
|
|
|
static void test_huge_blur(SkCanvas* canvas, skiatest::Reporter* reporter) {
|
2014-03-24 20:50:59 +00:00
|
|
|
SkBitmap bitmap;
|
|
|
|
bitmap.allocN32Pixels(100, 100);
|
|
|
|
bitmap.eraseARGB(0, 0, 0, 0);
|
|
|
|
|
|
|
|
// Check that a blur with an insane radius does not crash or assert.
|
|
|
|
SkPaint paint;
|
2016-04-04 11:31:25 +00:00
|
|
|
paint.setImageFilter(SkBlurImageFilter::Make(SkIntToScalar(1<<30),
|
|
|
|
SkIntToScalar(1<<30),
|
|
|
|
nullptr));
|
2015-12-16 16:38:15 +00:00
|
|
|
canvas->drawBitmap(bitmap, 0, 0, &paint);
|
2014-03-24 20:50:59 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
DEF_TEST(HugeBlurImageFilter, reporter) {
|
|
|
|
SkBitmap temp;
|
|
|
|
temp.allocN32Pixels(100, 100);
|
2015-06-22 16:46:59 +00:00
|
|
|
SkCanvas canvas(temp);
|
|
|
|
test_huge_blur(&canvas, reporter);
|
2014-03-24 20:50:59 +00:00
|
|
|
}
|
|
|
|
|
2016-04-11 18:58:39 +00:00
|
|
|
DEF_TEST(ImageFilterMatrixConvolutionSanityTest, reporter) {
|
2014-09-29 14:57:20 +00:00
|
|
|
SkScalar kernel[1] = { 0 };
|
|
|
|
SkScalar gain = SK_Scalar1, bias = 0;
|
|
|
|
SkIPoint kernelOffset = SkIPoint::Make(1, 1);
|
|
|
|
|
2015-08-27 14:41:13 +00:00
|
|
|
// Check that an enormous (non-allocatable) kernel gives a nullptr filter.
|
2016-04-08 15:01:20 +00:00
|
|
|
sk_sp<SkImageFilter> conv(SkMatrixConvolutionImageFilter::Make(
|
2014-09-29 14:57:20 +00:00
|
|
|
SkISize::Make(1<<30, 1<<30),
|
|
|
|
kernel,
|
|
|
|
gain,
|
|
|
|
bias,
|
|
|
|
kernelOffset,
|
|
|
|
SkMatrixConvolutionImageFilter::kRepeat_TileMode,
|
2016-04-08 15:01:20 +00:00
|
|
|
false,
|
|
|
|
nullptr));
|
2014-09-29 14:57:20 +00:00
|
|
|
|
2015-08-27 14:41:13 +00:00
|
|
|
REPORTER_ASSERT(reporter, nullptr == conv.get());
|
2014-09-29 14:57:20 +00:00
|
|
|
|
2015-08-27 14:41:13 +00:00
|
|
|
// Check that a nullptr kernel gives a nullptr filter.
|
2016-04-08 15:01:20 +00:00
|
|
|
conv = SkMatrixConvolutionImageFilter::Make(
|
2014-09-29 14:57:20 +00:00
|
|
|
SkISize::Make(1, 1),
|
2015-08-27 14:41:13 +00:00
|
|
|
nullptr,
|
2014-09-29 14:57:20 +00:00
|
|
|
gain,
|
|
|
|
bias,
|
|
|
|
kernelOffset,
|
|
|
|
SkMatrixConvolutionImageFilter::kRepeat_TileMode,
|
2016-04-08 15:01:20 +00:00
|
|
|
false,
|
|
|
|
nullptr);
|
2014-09-29 14:57:20 +00:00
|
|
|
|
2015-08-27 14:41:13 +00:00
|
|
|
REPORTER_ASSERT(reporter, nullptr == conv.get());
|
2014-09-29 14:57:20 +00:00
|
|
|
|
2015-08-27 14:41:13 +00:00
|
|
|
// Check that a kernel width < 1 gives a nullptr filter.
|
2016-04-08 15:01:20 +00:00
|
|
|
conv = SkMatrixConvolutionImageFilter::Make(
|
2014-09-29 14:57:20 +00:00
|
|
|
SkISize::Make(0, 1),
|
|
|
|
kernel,
|
|
|
|
gain,
|
|
|
|
bias,
|
|
|
|
kernelOffset,
|
|
|
|
SkMatrixConvolutionImageFilter::kRepeat_TileMode,
|
2016-04-08 15:01:20 +00:00
|
|
|
false,
|
|
|
|
nullptr);
|
2014-09-29 14:57:20 +00:00
|
|
|
|
2015-08-27 14:41:13 +00:00
|
|
|
REPORTER_ASSERT(reporter, nullptr == conv.get());
|
2014-09-29 14:57:20 +00:00
|
|
|
|
2015-08-27 14:41:13 +00:00
|
|
|
// Check that kernel height < 1 gives a nullptr filter.
|
2016-04-08 15:01:20 +00:00
|
|
|
conv = SkMatrixConvolutionImageFilter::Make(
|
2014-09-29 14:57:20 +00:00
|
|
|
SkISize::Make(1, -1),
|
|
|
|
kernel,
|
|
|
|
gain,
|
|
|
|
bias,
|
|
|
|
kernelOffset,
|
|
|
|
SkMatrixConvolutionImageFilter::kRepeat_TileMode,
|
2016-04-08 15:01:20 +00:00
|
|
|
false,
|
|
|
|
nullptr);
|
2014-09-29 14:57:20 +00:00
|
|
|
|
2015-08-27 14:41:13 +00:00
|
|
|
REPORTER_ASSERT(reporter, nullptr == conv.get());
|
2014-09-29 14:57:20 +00:00
|
|
|
}
|
|
|
|
|
2015-06-22 16:46:59 +00:00
|
|
|
static void test_xfermode_cropped_input(SkCanvas* canvas, skiatest::Reporter* reporter) {
|
|
|
|
canvas->clear(0);
|
Fix SkXfermodeImageFilter when an input is cropped out.
If one of inputs to SkXfermodeImageFilter draws nothing, either due to
it being cropped out upstream, or within the filter itself, the filter
should still draw the other input, since otherwise the result will be incorrect.
For the GPU path, since we can't detect this case in
canFilterImageGPU() without recursing, we'll just drop to
the generic path if either input is empty, since we can't use the effect in that case anyway.
While we're at it, let's drop to the generic path if the
xfermode can't be expressed as an effect, since the code
here was doing a 2-pass render in that case anyway, which
is equivalent to what the (xfermode == NULL) case was doing
anyway.
R=bsalomon@google.com, sugoi@chromium.org
Review URL: https://codereview.chromium.org/220723007
git-svn-id: http://skia.googlecode.com/svn/trunk@14016 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-01 19:15:23 +00:00
|
|
|
|
|
|
|
SkBitmap bitmap;
|
|
|
|
bitmap.allocN32Pixels(1, 1);
|
|
|
|
bitmap.eraseARGB(255, 255, 255, 255);
|
|
|
|
|
2016-04-05 18:50:42 +00:00
|
|
|
sk_sp<SkColorFilter> green(SkColorFilter::MakeModeFilter(SK_ColorGREEN,
|
|
|
|
SkXfermode::kSrcIn_Mode));
|
|
|
|
sk_sp<SkImageFilter> greenFilter(SkColorFilterImageFilter::Make(green, nullptr));
|
Fix SkXfermodeImageFilter when an input is cropped out.
If one of inputs to SkXfermodeImageFilter draws nothing, either due to
it being cropped out upstream, or within the filter itself, the filter
should still draw the other input, since otherwise the result will be incorrect.
For the GPU path, since we can't detect this case in
canFilterImageGPU() without recursing, we'll just drop to
the generic path if either input is empty, since we can't use the effect in that case anyway.
While we're at it, let's drop to the generic path if the
xfermode can't be expressed as an effect, since the code
here was doing a 2-pass render in that case anyway, which
is equivalent to what the (xfermode == NULL) case was doing
anyway.
R=bsalomon@google.com, sugoi@chromium.org
Review URL: https://codereview.chromium.org/220723007
git-svn-id: http://skia.googlecode.com/svn/trunk@14016 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-01 19:15:23 +00:00
|
|
|
SkImageFilter::CropRect cropRect(SkRect::MakeEmpty());
|
2016-04-05 18:50:42 +00:00
|
|
|
sk_sp<SkImageFilter> croppedOut(SkColorFilterImageFilter::Make(green, nullptr, &cropRect));
|
Fix SkXfermodeImageFilter when an input is cropped out.
If one of inputs to SkXfermodeImageFilter draws nothing, either due to
it being cropped out upstream, or within the filter itself, the filter
should still draw the other input, since otherwise the result will be incorrect.
For the GPU path, since we can't detect this case in
canFilterImageGPU() without recursing, we'll just drop to
the generic path if either input is empty, since we can't use the effect in that case anyway.
While we're at it, let's drop to the generic path if the
xfermode can't be expressed as an effect, since the code
here was doing a 2-pass render in that case anyway, which
is equivalent to what the (xfermode == NULL) case was doing
anyway.
R=bsalomon@google.com, sugoi@chromium.org
Review URL: https://codereview.chromium.org/220723007
git-svn-id: http://skia.googlecode.com/svn/trunk@14016 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-01 19:15:23 +00:00
|
|
|
|
|
|
|
// Check that an xfermode image filter whose input has been cropped out still draws the other
|
|
|
|
// input. Also check that drawing with both inputs cropped out doesn't cause a GPU warning.
|
2016-04-05 19:48:34 +00:00
|
|
|
sk_sp<SkXfermode> mode(SkXfermode::Make(SkXfermode::kSrcOver_Mode));
|
|
|
|
sk_sp<SkImageFilter> xfermodeNoFg(SkXfermodeImageFilter::Make(mode, greenFilter,
|
|
|
|
croppedOut, nullptr));
|
|
|
|
sk_sp<SkImageFilter> xfermodeNoBg(SkXfermodeImageFilter::Make(mode, croppedOut,
|
|
|
|
greenFilter, nullptr));
|
|
|
|
sk_sp<SkImageFilter> xfermodeNoFgNoBg(SkXfermodeImageFilter::Make(mode, croppedOut,
|
|
|
|
croppedOut, nullptr));
|
Fix SkXfermodeImageFilter when an input is cropped out.
If one of inputs to SkXfermodeImageFilter draws nothing, either due to
it being cropped out upstream, or within the filter itself, the filter
should still draw the other input, since otherwise the result will be incorrect.
For the GPU path, since we can't detect this case in
canFilterImageGPU() without recursing, we'll just drop to
the generic path if either input is empty, since we can't use the effect in that case anyway.
While we're at it, let's drop to the generic path if the
xfermode can't be expressed as an effect, since the code
here was doing a 2-pass render in that case anyway, which
is equivalent to what the (xfermode == NULL) case was doing
anyway.
R=bsalomon@google.com, sugoi@chromium.org
Review URL: https://codereview.chromium.org/220723007
git-svn-id: http://skia.googlecode.com/svn/trunk@14016 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-01 19:15:23 +00:00
|
|
|
|
|
|
|
SkPaint paint;
|
2016-04-05 19:48:34 +00:00
|
|
|
paint.setImageFilter(std::move(xfermodeNoFg));
|
2015-12-16 16:38:15 +00:00
|
|
|
canvas->drawBitmap(bitmap, 0, 0, &paint); // drawSprite
|
Fix SkXfermodeImageFilter when an input is cropped out.
If one of inputs to SkXfermodeImageFilter draws nothing, either due to
it being cropped out upstream, or within the filter itself, the filter
should still draw the other input, since otherwise the result will be incorrect.
For the GPU path, since we can't detect this case in
canFilterImageGPU() without recursing, we'll just drop to
the generic path if either input is empty, since we can't use the effect in that case anyway.
While we're at it, let's drop to the generic path if the
xfermode can't be expressed as an effect, since the code
here was doing a 2-pass render in that case anyway, which
is equivalent to what the (xfermode == NULL) case was doing
anyway.
R=bsalomon@google.com, sugoi@chromium.org
Review URL: https://codereview.chromium.org/220723007
git-svn-id: http://skia.googlecode.com/svn/trunk@14016 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-01 19:15:23 +00:00
|
|
|
|
|
|
|
uint32_t pixel;
|
2015-03-06 15:16:00 +00:00
|
|
|
SkImageInfo info = SkImageInfo::Make(1, 1, kBGRA_8888_SkColorType, kUnpremul_SkAlphaType);
|
2015-06-22 16:46:59 +00:00
|
|
|
canvas->readPixels(info, &pixel, 4, 0, 0);
|
Fix SkXfermodeImageFilter when an input is cropped out.
If one of inputs to SkXfermodeImageFilter draws nothing, either due to
it being cropped out upstream, or within the filter itself, the filter
should still draw the other input, since otherwise the result will be incorrect.
For the GPU path, since we can't detect this case in
canFilterImageGPU() without recursing, we'll just drop to
the generic path if either input is empty, since we can't use the effect in that case anyway.
While we're at it, let's drop to the generic path if the
xfermode can't be expressed as an effect, since the code
here was doing a 2-pass render in that case anyway, which
is equivalent to what the (xfermode == NULL) case was doing
anyway.
R=bsalomon@google.com, sugoi@chromium.org
Review URL: https://codereview.chromium.org/220723007
git-svn-id: http://skia.googlecode.com/svn/trunk@14016 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-01 19:15:23 +00:00
|
|
|
REPORTER_ASSERT(reporter, pixel == SK_ColorGREEN);
|
|
|
|
|
2016-04-05 19:48:34 +00:00
|
|
|
paint.setImageFilter(std::move(xfermodeNoBg));
|
2015-12-16 16:38:15 +00:00
|
|
|
canvas->drawBitmap(bitmap, 0, 0, &paint); // drawSprite
|
2015-06-22 16:46:59 +00:00
|
|
|
canvas->readPixels(info, &pixel, 4, 0, 0);
|
Fix SkXfermodeImageFilter when an input is cropped out.
If one of inputs to SkXfermodeImageFilter draws nothing, either due to
it being cropped out upstream, or within the filter itself, the filter
should still draw the other input, since otherwise the result will be incorrect.
For the GPU path, since we can't detect this case in
canFilterImageGPU() without recursing, we'll just drop to
the generic path if either input is empty, since we can't use the effect in that case anyway.
While we're at it, let's drop to the generic path if the
xfermode can't be expressed as an effect, since the code
here was doing a 2-pass render in that case anyway, which
is equivalent to what the (xfermode == NULL) case was doing
anyway.
R=bsalomon@google.com, sugoi@chromium.org
Review URL: https://codereview.chromium.org/220723007
git-svn-id: http://skia.googlecode.com/svn/trunk@14016 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-01 19:15:23 +00:00
|
|
|
REPORTER_ASSERT(reporter, pixel == SK_ColorGREEN);
|
|
|
|
|
2016-04-05 19:48:34 +00:00
|
|
|
paint.setImageFilter(std::move(xfermodeNoFgNoBg));
|
2015-12-16 16:38:15 +00:00
|
|
|
canvas->drawBitmap(bitmap, 0, 0, &paint); // drawSprite
|
2015-06-22 16:46:59 +00:00
|
|
|
canvas->readPixels(info, &pixel, 4, 0, 0);
|
Fix SkXfermodeImageFilter when an input is cropped out.
If one of inputs to SkXfermodeImageFilter draws nothing, either due to
it being cropped out upstream, or within the filter itself, the filter
should still draw the other input, since otherwise the result will be incorrect.
For the GPU path, since we can't detect this case in
canFilterImageGPU() without recursing, we'll just drop to
the generic path if either input is empty, since we can't use the effect in that case anyway.
While we're at it, let's drop to the generic path if the
xfermode can't be expressed as an effect, since the code
here was doing a 2-pass render in that case anyway, which
is equivalent to what the (xfermode == NULL) case was doing
anyway.
R=bsalomon@google.com, sugoi@chromium.org
Review URL: https://codereview.chromium.org/220723007
git-svn-id: http://skia.googlecode.com/svn/trunk@14016 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-01 19:15:23 +00:00
|
|
|
REPORTER_ASSERT(reporter, pixel == SK_ColorGREEN);
|
|
|
|
}
|
|
|
|
|
2014-04-02 19:20:05 +00:00
|
|
|
DEF_TEST(ImageFilterNestedSaveLayer, reporter) {
|
|
|
|
SkBitmap temp;
|
|
|
|
temp.allocN32Pixels(50, 50);
|
2015-06-22 16:46:59 +00:00
|
|
|
SkCanvas canvas(temp);
|
2014-04-02 19:20:05 +00:00
|
|
|
canvas.clear(0x0);
|
|
|
|
|
|
|
|
SkBitmap bitmap;
|
|
|
|
bitmap.allocN32Pixels(10, 10);
|
|
|
|
bitmap.eraseColor(SK_ColorGREEN);
|
|
|
|
|
|
|
|
SkMatrix matrix;
|
|
|
|
matrix.setScale(SkIntToScalar(2), SkIntToScalar(2));
|
|
|
|
matrix.postTranslate(SkIntToScalar(-20), SkIntToScalar(-20));
|
2016-04-05 22:09:00 +00:00
|
|
|
sk_sp<SkImageFilter> matrixFilter(
|
|
|
|
SkImageFilter::MakeMatrixFilter(matrix, kLow_SkFilterQuality, nullptr));
|
2014-04-02 19:20:05 +00:00
|
|
|
|
|
|
|
// Test that saveLayer() with a filter nested inside another saveLayer() applies the
|
|
|
|
// correct offset to the filter matrix.
|
|
|
|
SkRect bounds1 = SkRect::MakeXYWH(10, 10, 30, 30);
|
2015-08-27 14:41:13 +00:00
|
|
|
canvas.saveLayer(&bounds1, nullptr);
|
2014-04-02 19:20:05 +00:00
|
|
|
SkPaint filterPaint;
|
2016-04-05 22:09:00 +00:00
|
|
|
filterPaint.setImageFilter(std::move(matrixFilter));
|
2014-04-02 19:20:05 +00:00
|
|
|
SkRect bounds2 = SkRect::MakeXYWH(20, 20, 10, 10);
|
|
|
|
canvas.saveLayer(&bounds2, &filterPaint);
|
|
|
|
SkPaint greenPaint;
|
|
|
|
greenPaint.setColor(SK_ColorGREEN);
|
|
|
|
canvas.drawRect(bounds2, greenPaint);
|
|
|
|
canvas.restore();
|
|
|
|
canvas.restore();
|
|
|
|
SkPaint strokePaint;
|
|
|
|
strokePaint.setStyle(SkPaint::kStroke_Style);
|
|
|
|
strokePaint.setColor(SK_ColorRED);
|
|
|
|
|
2015-03-06 15:16:00 +00:00
|
|
|
SkImageInfo info = SkImageInfo::Make(1, 1, kBGRA_8888_SkColorType, kUnpremul_SkAlphaType);
|
2014-04-02 19:20:05 +00:00
|
|
|
uint32_t pixel;
|
|
|
|
canvas.readPixels(info, &pixel, 4, 25, 25);
|
|
|
|
REPORTER_ASSERT(reporter, pixel == SK_ColorGREEN);
|
|
|
|
|
|
|
|
// Test that drawSprite() with a filter nested inside a saveLayer() applies the
|
|
|
|
// correct offset to the filter matrix.
|
|
|
|
canvas.clear(0x0);
|
|
|
|
canvas.readPixels(info, &pixel, 4, 25, 25);
|
2015-08-27 14:41:13 +00:00
|
|
|
canvas.saveLayer(&bounds1, nullptr);
|
2015-12-16 16:38:15 +00:00
|
|
|
canvas.drawBitmap(bitmap, 20, 20, &filterPaint); // drawSprite
|
2014-04-02 19:20:05 +00:00
|
|
|
canvas.restore();
|
|
|
|
|
|
|
|
canvas.readPixels(info, &pixel, 4, 25, 25);
|
|
|
|
REPORTER_ASSERT(reporter, pixel == SK_ColorGREEN);
|
|
|
|
}
|
|
|
|
|
Fix SkXfermodeImageFilter when an input is cropped out.
If one of inputs to SkXfermodeImageFilter draws nothing, either due to
it being cropped out upstream, or within the filter itself, the filter
should still draw the other input, since otherwise the result will be incorrect.
For the GPU path, since we can't detect this case in
canFilterImageGPU() without recursing, we'll just drop to
the generic path if either input is empty, since we can't use the effect in that case anyway.
While we're at it, let's drop to the generic path if the
xfermode can't be expressed as an effect, since the code
here was doing a 2-pass render in that case anyway, which
is equivalent to what the (xfermode == NULL) case was doing
anyway.
R=bsalomon@google.com, sugoi@chromium.org
Review URL: https://codereview.chromium.org/220723007
git-svn-id: http://skia.googlecode.com/svn/trunk@14016 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-01 19:15:23 +00:00
|
|
|
DEF_TEST(XfermodeImageFilterCroppedInput, reporter) {
|
|
|
|
SkBitmap temp;
|
|
|
|
temp.allocN32Pixels(100, 100);
|
2015-06-22 16:46:59 +00:00
|
|
|
SkCanvas canvas(temp);
|
|
|
|
test_xfermode_cropped_input(&canvas, reporter);
|
Fix SkXfermodeImageFilter when an input is cropped out.
If one of inputs to SkXfermodeImageFilter draws nothing, either due to
it being cropped out upstream, or within the filter itself, the filter
should still draw the other input, since otherwise the result will be incorrect.
For the GPU path, since we can't detect this case in
canFilterImageGPU() without recursing, we'll just drop to
the generic path if either input is empty, since we can't use the effect in that case anyway.
While we're at it, let's drop to the generic path if the
xfermode can't be expressed as an effect, since the code
here was doing a 2-pass render in that case anyway, which
is equivalent to what the (xfermode == NULL) case was doing
anyway.
R=bsalomon@google.com, sugoi@chromium.org
Review URL: https://codereview.chromium.org/220723007
git-svn-id: http://skia.googlecode.com/svn/trunk@14016 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-01 19:15:23 +00:00
|
|
|
}
|
2014-03-24 20:50:59 +00:00
|
|
|
|
2016-03-07 20:45:14 +00:00
|
|
|
static void test_composed_imagefilter_offset(SkImageFilter::Proxy* proxy,
|
|
|
|
skiatest::Reporter* reporter,
|
|
|
|
GrContext* context) {
|
2016-03-17 21:31:39 +00:00
|
|
|
sk_sp<SkSpecialImage> srcImg(create_empty_special_image(context, proxy, 100));
|
2015-02-13 17:05:47 +00:00
|
|
|
|
|
|
|
SkImageFilter::CropRect cropRect(SkRect::MakeXYWH(1, 0, 20, 20));
|
2016-03-31 16:05:49 +00:00
|
|
|
sk_sp<SkImageFilter> offsetFilter(SkOffsetImageFilter::Make(0, 0, nullptr, &cropRect));
|
2016-04-04 11:31:25 +00:00
|
|
|
sk_sp<SkImageFilter> blurFilter(SkBlurImageFilter::Make(SK_Scalar1, SK_Scalar1,
|
|
|
|
nullptr, &cropRect));
|
2016-03-30 19:32:58 +00:00
|
|
|
sk_sp<SkImageFilter> composedFilter(SkComposeImageFilter::Make(std::move(blurFilter),
|
|
|
|
std::move(offsetFilter)));
|
2015-02-13 17:05:47 +00:00
|
|
|
SkIPoint offset;
|
2016-01-11 18:56:59 +00:00
|
|
|
SkImageFilter::Context ctx(SkMatrix::I(), SkIRect::MakeWH(100, 100), nullptr);
|
2016-03-07 20:45:14 +00:00
|
|
|
|
2016-03-24 14:26:32 +00:00
|
|
|
sk_sp<SkSpecialImage> resultImg(composedFilter->filterImage(srcImg.get(), ctx, &offset));
|
2016-03-07 20:45:14 +00:00
|
|
|
REPORTER_ASSERT(reporter, resultImg);
|
2015-02-13 17:05:47 +00:00
|
|
|
REPORTER_ASSERT(reporter, offset.fX == 1 && offset.fY == 0);
|
|
|
|
}
|
|
|
|
|
2016-03-07 20:45:14 +00:00
|
|
|
DEF_TEST(ComposedImageFilterOffset, reporter) {
|
|
|
|
run_raster_test(reporter, 100, test_composed_imagefilter_offset);
|
|
|
|
}
|
|
|
|
|
|
|
|
#if SK_SUPPORT_GPU
|
2016-04-12 16:59:58 +00:00
|
|
|
DEF_GPUTEST_FOR_RENDERING_CONTEXTS(ComposedImageFilterOffset_Gpu, reporter, ctxInfo) {
|
2016-04-05 19:59:06 +00:00
|
|
|
run_gpu_test(reporter, ctxInfo.fGrContext, 100, test_composed_imagefilter_offset);
|
2016-03-07 20:45:14 +00:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2016-03-21 15:38:58 +00:00
|
|
|
static void test_composed_imagefilter_bounds(SkImageFilter::Proxy* proxy,
|
|
|
|
skiatest::Reporter* reporter,
|
|
|
|
GrContext* context) {
|
|
|
|
// The bounds passed to the inner filter must be filtered by the outer
|
|
|
|
// filter, so that the inner filter produces the pixels that the outer
|
|
|
|
// filter requires as input. This matters if the outer filter moves pixels.
|
|
|
|
// Here, accounting for the outer offset is necessary so that the green
|
|
|
|
// pixels of the picture are not clipped.
|
|
|
|
|
|
|
|
SkPictureRecorder recorder;
|
|
|
|
SkCanvas* recordingCanvas = recorder.beginRecording(SkRect::MakeWH(200, 100));
|
|
|
|
recordingCanvas->clipRect(SkRect::MakeXYWH(100, 0, 100, 100));
|
|
|
|
recordingCanvas->clear(SK_ColorGREEN);
|
2016-03-30 19:32:58 +00:00
|
|
|
sk_sp<SkPicture> picture(recorder.finishRecordingAsPicture());
|
2016-03-28 20:13:42 +00:00
|
|
|
sk_sp<SkImageFilter> pictureFilter(SkPictureImageFilter::Make(picture));
|
2016-03-21 15:38:58 +00:00
|
|
|
SkImageFilter::CropRect cropRect(SkRect::MakeWH(100, 100));
|
2016-03-31 16:05:49 +00:00
|
|
|
sk_sp<SkImageFilter> offsetFilter(SkOffsetImageFilter::Make(-100, 0, nullptr, &cropRect));
|
2016-03-30 19:32:58 +00:00
|
|
|
sk_sp<SkImageFilter> composedFilter(SkComposeImageFilter::Make(std::move(offsetFilter),
|
|
|
|
std::move(pictureFilter)));
|
2016-03-21 15:38:58 +00:00
|
|
|
|
|
|
|
sk_sp<SkSpecialImage> sourceImage(create_empty_special_image(context, proxy, 100));
|
|
|
|
SkImageFilter::Context ctx(SkMatrix::I(), SkIRect::MakeWH(100, 100), nullptr);
|
|
|
|
SkIPoint offset;
|
|
|
|
sk_sp<SkSpecialImage> result(composedFilter->filterImage(sourceImage.get(), ctx, &offset));
|
|
|
|
REPORTER_ASSERT(reporter, offset.isZero());
|
|
|
|
REPORTER_ASSERT(reporter, result);
|
|
|
|
REPORTER_ASSERT(reporter, result->subset().size() == SkISize::Make(100, 100));
|
|
|
|
|
|
|
|
SkBitmap resultBM;
|
2016-04-08 19:10:42 +00:00
|
|
|
REPORTER_ASSERT(reporter, result->getROPixels(&resultBM));
|
2016-03-21 15:38:58 +00:00
|
|
|
SkAutoLockPixels lock(resultBM);
|
|
|
|
REPORTER_ASSERT(reporter, resultBM.getColor(50, 50) == SK_ColorGREEN);
|
|
|
|
}
|
|
|
|
|
|
|
|
DEF_TEST(ComposedImageFilterBounds, reporter) {
|
|
|
|
run_raster_test(reporter, 100, test_composed_imagefilter_bounds);
|
|
|
|
}
|
|
|
|
|
|
|
|
#if SK_SUPPORT_GPU
|
2016-04-06 21:02:39 +00:00
|
|
|
DEF_GPUTEST_FOR_GL_RENDERING_CONTEXTS(ComposedImageFilterBounds_Gpu, reporter, ctxInfo) {
|
2016-04-05 19:59:06 +00:00
|
|
|
run_gpu_test(reporter, ctxInfo.fGrContext, 100, test_composed_imagefilter_bounds);
|
2016-03-21 15:38:58 +00:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2016-03-07 20:45:14 +00:00
|
|
|
static void test_partial_crop_rect(SkImageFilter::Proxy* proxy,
|
|
|
|
skiatest::Reporter* reporter,
|
|
|
|
GrContext* context) {
|
2016-03-17 21:31:39 +00:00
|
|
|
sk_sp<SkSpecialImage> srcImg(create_empty_special_image(context, proxy, 100));
|
2015-07-13 17:27:05 +00:00
|
|
|
|
|
|
|
SkImageFilter::CropRect cropRect(SkRect::MakeXYWH(100, 0, 20, 30),
|
2015-07-16 22:19:11 +00:00
|
|
|
SkImageFilter::CropRect::kHasWidth_CropEdge | SkImageFilter::CropRect::kHasHeight_CropEdge);
|
2016-04-05 18:50:42 +00:00
|
|
|
sk_sp<SkImageFilter> filter(make_grayscale(nullptr, &cropRect));
|
2015-07-13 17:27:05 +00:00
|
|
|
SkIPoint offset;
|
2016-01-11 18:56:59 +00:00
|
|
|
SkImageFilter::Context ctx(SkMatrix::I(), SkIRect::MakeWH(100, 100), nullptr);
|
2016-03-07 20:45:14 +00:00
|
|
|
|
2016-03-24 14:26:32 +00:00
|
|
|
sk_sp<SkSpecialImage> resultImg(filter->filterImage(srcImg.get(), ctx, &offset));
|
2016-03-07 20:45:14 +00:00
|
|
|
REPORTER_ASSERT(reporter, resultImg);
|
|
|
|
|
2015-07-13 17:27:05 +00:00
|
|
|
REPORTER_ASSERT(reporter, offset.fX == 0);
|
|
|
|
REPORTER_ASSERT(reporter, offset.fY == 0);
|
2016-03-07 20:45:14 +00:00
|
|
|
REPORTER_ASSERT(reporter, resultImg->width() == 20);
|
|
|
|
REPORTER_ASSERT(reporter, resultImg->height() == 30);
|
|
|
|
}
|
|
|
|
|
2016-04-11 18:58:39 +00:00
|
|
|
DEF_TEST(ImageFilterPartialCropRect, reporter) {
|
2016-03-07 20:45:14 +00:00
|
|
|
run_raster_test(reporter, 100, test_partial_crop_rect);
|
2015-07-13 17:27:05 +00:00
|
|
|
}
|
|
|
|
|
2016-03-07 20:45:14 +00:00
|
|
|
#if SK_SUPPORT_GPU
|
2016-04-12 16:59:58 +00:00
|
|
|
DEF_GPUTEST_FOR_RENDERING_CONTEXTS(ImageFilterPartialCropRect_Gpu, reporter, ctxInfo) {
|
2016-04-05 19:59:06 +00:00
|
|
|
run_gpu_test(reporter, ctxInfo.fGrContext, 100, test_partial_crop_rect);
|
2016-03-07 20:45:14 +00:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2015-08-20 18:10:41 +00:00
|
|
|
DEF_TEST(ImageFilterCanComputeFastBounds, reporter) {
|
|
|
|
|
2016-04-08 23:28:09 +00:00
|
|
|
{
|
|
|
|
SkPoint3 location = SkPoint3::Make(0, 0, SK_Scalar1);
|
|
|
|
sk_sp<SkImageFilter> lighting(SkLightingImageFilter::MakePointLitDiffuse(location,
|
|
|
|
SK_ColorGREEN,
|
|
|
|
0, 0, nullptr));
|
|
|
|
REPORTER_ASSERT(reporter, !lighting->canComputeFastBounds());
|
|
|
|
}
|
2015-08-20 18:10:41 +00:00
|
|
|
|
|
|
|
{
|
2016-04-04 11:31:25 +00:00
|
|
|
sk_sp<SkImageFilter> gray(make_grayscale(nullptr, nullptr));
|
|
|
|
REPORTER_ASSERT(reporter, gray->canComputeFastBounds());
|
|
|
|
{
|
|
|
|
SkColorFilter* grayCF;
|
|
|
|
REPORTER_ASSERT(reporter, gray->asAColorFilter(&grayCF));
|
|
|
|
REPORTER_ASSERT(reporter, !grayCF->affectsTransparentBlack());
|
|
|
|
grayCF->unref();
|
|
|
|
}
|
|
|
|
REPORTER_ASSERT(reporter, gray->canComputeFastBounds());
|
2015-08-20 18:10:41 +00:00
|
|
|
|
2016-04-04 11:31:25 +00:00
|
|
|
sk_sp<SkImageFilter> grayBlur(SkBlurImageFilter::Make(SK_Scalar1, SK_Scalar1,
|
|
|
|
std::move(gray)));
|
|
|
|
REPORTER_ASSERT(reporter, grayBlur->canComputeFastBounds());
|
|
|
|
}
|
2015-08-20 18:10:41 +00:00
|
|
|
|
2016-04-04 11:31:25 +00:00
|
|
|
{
|
|
|
|
SkScalar greenMatrix[20] = { 0, 0, 0, 0, 0,
|
|
|
|
0, 0, 0, 0, 1,
|
|
|
|
0, 0, 0, 0, 0,
|
|
|
|
0, 0, 0, 0, 1 };
|
|
|
|
sk_sp<SkColorFilter> greenCF(SkColorFilter::MakeMatrixFilterRowMajor255(greenMatrix));
|
2016-04-05 18:50:42 +00:00
|
|
|
sk_sp<SkImageFilter> green(SkColorFilterImageFilter::Make(greenCF, nullptr));
|
2016-04-04 11:31:25 +00:00
|
|
|
|
|
|
|
REPORTER_ASSERT(reporter, greenCF->affectsTransparentBlack());
|
|
|
|
REPORTER_ASSERT(reporter, !green->canComputeFastBounds());
|
|
|
|
|
|
|
|
sk_sp<SkImageFilter> greenBlur(SkBlurImageFilter::Make(SK_Scalar1, SK_Scalar1,
|
|
|
|
std::move(green)));
|
|
|
|
REPORTER_ASSERT(reporter, !greenBlur->canComputeFastBounds());
|
|
|
|
}
|
2015-08-20 18:10:41 +00:00
|
|
|
|
|
|
|
uint8_t allOne[256], identity[256];
|
|
|
|
for (int i = 0; i < 256; ++i) {
|
|
|
|
identity[i] = i;
|
|
|
|
allOne[i] = 255;
|
|
|
|
}
|
|
|
|
|
2016-04-05 18:50:42 +00:00
|
|
|
sk_sp<SkColorFilter> identityCF(SkTableColorFilter::MakeARGB(identity, identity,
|
|
|
|
identity, allOne));
|
|
|
|
sk_sp<SkImageFilter> identityFilter(SkColorFilterImageFilter::Make(identityCF, nullptr));
|
2015-08-20 18:10:41 +00:00
|
|
|
REPORTER_ASSERT(reporter, !identityCF->affectsTransparentBlack());
|
|
|
|
REPORTER_ASSERT(reporter, identityFilter->canComputeFastBounds());
|
|
|
|
|
2016-04-05 18:50:42 +00:00
|
|
|
sk_sp<SkColorFilter> forceOpaqueCF(SkTableColorFilter::MakeARGB(allOne, identity,
|
|
|
|
identity, identity));
|
|
|
|
sk_sp<SkImageFilter> forceOpaque(SkColorFilterImageFilter::Make(forceOpaqueCF, nullptr));
|
2015-08-20 18:10:41 +00:00
|
|
|
REPORTER_ASSERT(reporter, forceOpaqueCF->affectsTransparentBlack());
|
|
|
|
REPORTER_ASSERT(reporter, !forceOpaque->canComputeFastBounds());
|
|
|
|
}
|
|
|
|
|
2015-09-14 20:31:18 +00:00
|
|
|
// Verify that SkImageSource survives serialization
|
|
|
|
DEF_TEST(ImageFilterImageSourceSerialization, reporter) {
|
2016-03-24 01:59:25 +00:00
|
|
|
auto surface(SkSurface::MakeRasterN32Premul(10, 10));
|
2015-09-14 20:31:18 +00:00
|
|
|
surface->getCanvas()->clear(SK_ColorGREEN);
|
2016-03-17 17:51:11 +00:00
|
|
|
sk_sp<SkImage> image(surface->makeImageSnapshot());
|
2016-04-01 16:28:51 +00:00
|
|
|
sk_sp<SkImageFilter> filter(SkImageSource::Make(std::move(image)));
|
2015-09-14 20:31:18 +00:00
|
|
|
|
2016-04-01 16:28:51 +00:00
|
|
|
sk_sp<SkData> data(SkValidatingSerializeFlattenable(filter.get()));
|
|
|
|
sk_sp<SkFlattenable> flattenable(SkValidatingDeserializeFlattenable(
|
2016-04-04 21:57:19 +00:00
|
|
|
data->data(), data->size(), SkImageFilter::GetFlattenableType()));
|
2015-09-14 20:31:18 +00:00
|
|
|
SkImageFilter* unflattenedFilter = static_cast<SkImageFilter*>(flattenable.get());
|
|
|
|
REPORTER_ASSERT(reporter, unflattenedFilter);
|
|
|
|
|
|
|
|
SkBitmap bm;
|
|
|
|
bm.allocN32Pixels(10, 10);
|
2015-09-15 13:56:23 +00:00
|
|
|
bm.eraseColor(SK_ColorBLUE);
|
2015-09-14 20:31:18 +00:00
|
|
|
SkPaint paint;
|
|
|
|
paint.setColor(SK_ColorRED);
|
|
|
|
paint.setImageFilter(unflattenedFilter);
|
|
|
|
|
|
|
|
SkCanvas canvas(bm);
|
|
|
|
canvas.drawRect(SkRect::MakeWH(10, 10), paint);
|
|
|
|
REPORTER_ASSERT(reporter, *bm.getAddr32(0, 0) == SkPreMultiplyColor(SK_ColorGREEN));
|
|
|
|
}
|
|
|
|
|
2016-01-05 16:39:28 +00:00
|
|
|
static void test_large_blur_input(skiatest::Reporter* reporter, SkCanvas* canvas) {
|
|
|
|
SkBitmap largeBmp;
|
|
|
|
int largeW = 5000;
|
|
|
|
int largeH = 5000;
|
|
|
|
#if SK_SUPPORT_GPU
|
|
|
|
// If we're GPU-backed make the bitmap too large to be converted into a texture.
|
|
|
|
if (GrContext* ctx = canvas->getGrContext()) {
|
|
|
|
largeW = ctx->caps()->maxTextureSize() + 1;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
largeBmp.allocN32Pixels(largeW, largeH);
|
2016-02-07 20:23:10 +00:00
|
|
|
largeBmp.eraseColor(0);
|
2016-01-05 16:39:28 +00:00
|
|
|
if (!largeBmp.getPixels()) {
|
|
|
|
ERRORF(reporter, "Failed to allocate large bmp.");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2016-03-17 17:51:11 +00:00
|
|
|
sk_sp<SkImage> largeImage(SkImage::MakeFromBitmap(largeBmp));
|
2016-01-05 16:39:28 +00:00
|
|
|
if (!largeImage) {
|
|
|
|
ERRORF(reporter, "Failed to create large image.");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2016-04-01 16:28:51 +00:00
|
|
|
sk_sp<SkImageFilter> largeSource(SkImageSource::Make(std::move(largeImage)));
|
2016-01-05 16:39:28 +00:00
|
|
|
if (!largeSource) {
|
|
|
|
ERRORF(reporter, "Failed to create large SkImageSource.");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2016-04-04 11:31:25 +00:00
|
|
|
sk_sp<SkImageFilter> blur(SkBlurImageFilter::Make(10.f, 10.f, std::move(largeSource)));
|
2016-01-05 16:39:28 +00:00
|
|
|
if (!blur) {
|
|
|
|
ERRORF(reporter, "Failed to create SkBlurImageFilter.");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
SkPaint paint;
|
2016-04-01 16:28:51 +00:00
|
|
|
paint.setImageFilter(std::move(blur));
|
2016-01-05 16:39:28 +00:00
|
|
|
|
|
|
|
// This should not crash (http://crbug.com/570479).
|
|
|
|
canvas->drawRect(SkRect::MakeIWH(largeW, largeH), paint);
|
|
|
|
}
|
|
|
|
|
2016-04-11 18:58:39 +00:00
|
|
|
DEF_TEST(ImageFilterBlurLargeImage, reporter) {
|
2016-03-24 01:59:25 +00:00
|
|
|
auto surface(SkSurface::MakeRaster(SkImageInfo::MakeN32Premul(100, 100)));
|
2016-01-05 16:39:28 +00:00
|
|
|
test_large_blur_input(reporter, surface->getCanvas());
|
|
|
|
}
|
|
|
|
|
2014-02-03 22:36:39 +00:00
|
|
|
#if SK_SUPPORT_GPU
|
2014-09-22 14:29:03 +00:00
|
|
|
|
2016-04-12 16:59:58 +00:00
|
|
|
DEF_GPUTEST_FOR_RENDERING_CONTEXTS(ImageFilterHugeBlur_Gpu, reporter, ctxInfo) {
|
2015-06-22 19:06:08 +00:00
|
|
|
const SkSurfaceProps props(SkSurfaceProps::kLegacyFontHost_InitType);
|
|
|
|
|
2016-04-08 23:28:09 +00:00
|
|
|
sk_sp<SkGpuDevice> device(SkGpuDevice::Create(ctxInfo.fGrContext,
|
|
|
|
SkBudgeted::kNo,
|
|
|
|
SkImageInfo::MakeN32Premul(100, 100),
|
|
|
|
0,
|
|
|
|
&props,
|
|
|
|
SkGpuDevice::kUninit_InitContents));
|
|
|
|
SkCanvas canvas(device.get());
|
2015-06-22 16:46:59 +00:00
|
|
|
|
|
|
|
test_huge_blur(&canvas, reporter);
|
2014-03-24 20:50:59 +00:00
|
|
|
}
|
Fix SkXfermodeImageFilter when an input is cropped out.
If one of inputs to SkXfermodeImageFilter draws nothing, either due to
it being cropped out upstream, or within the filter itself, the filter
should still draw the other input, since otherwise the result will be incorrect.
For the GPU path, since we can't detect this case in
canFilterImageGPU() without recursing, we'll just drop to
the generic path if either input is empty, since we can't use the effect in that case anyway.
While we're at it, let's drop to the generic path if the
xfermode can't be expressed as an effect, since the code
here was doing a 2-pass render in that case anyway, which
is equivalent to what the (xfermode == NULL) case was doing
anyway.
R=bsalomon@google.com, sugoi@chromium.org
Review URL: https://codereview.chromium.org/220723007
git-svn-id: http://skia.googlecode.com/svn/trunk@14016 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-01 19:15:23 +00:00
|
|
|
|
2016-04-06 21:02:39 +00:00
|
|
|
DEF_GPUTEST_FOR_GL_RENDERING_CONTEXTS(XfermodeImageFilterCroppedInput_Gpu, reporter, ctxInfo) {
|
2015-06-22 19:06:08 +00:00
|
|
|
const SkSurfaceProps props(SkSurfaceProps::kLegacyFontHost_InitType);
|
|
|
|
|
2016-04-08 23:28:09 +00:00
|
|
|
sk_sp<SkGpuDevice> device(SkGpuDevice::Create(ctxInfo.fGrContext,
|
|
|
|
SkBudgeted::kNo,
|
|
|
|
SkImageInfo::MakeN32Premul(1, 1),
|
|
|
|
0,
|
|
|
|
&props,
|
|
|
|
SkGpuDevice::kUninit_InitContents));
|
|
|
|
SkCanvas canvas(device.get());
|
2015-06-22 16:46:59 +00:00
|
|
|
|
|
|
|
test_xfermode_cropped_input(&canvas, reporter);
|
Fix SkXfermodeImageFilter when an input is cropped out.
If one of inputs to SkXfermodeImageFilter draws nothing, either due to
it being cropped out upstream, or within the filter itself, the filter
should still draw the other input, since otherwise the result will be incorrect.
For the GPU path, since we can't detect this case in
canFilterImageGPU() without recursing, we'll just drop to
the generic path if either input is empty, since we can't use the effect in that case anyway.
While we're at it, let's drop to the generic path if the
xfermode can't be expressed as an effect, since the code
here was doing a 2-pass render in that case anyway, which
is equivalent to what the (xfermode == NULL) case was doing
anyway.
R=bsalomon@google.com, sugoi@chromium.org
Review URL: https://codereview.chromium.org/220723007
git-svn-id: http://skia.googlecode.com/svn/trunk@14016 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-01 19:15:23 +00:00
|
|
|
}
|
2014-09-09 16:15:04 +00:00
|
|
|
|
2016-04-11 18:58:39 +00:00
|
|
|
DEF_GPUTEST_FOR_ALL_GL_CONTEXTS(ImageFilterBlurLargeImage_Gpu, reporter, ctxInfo) {
|
2016-04-05 19:59:06 +00:00
|
|
|
auto surface(SkSurface::MakeRenderTarget(ctxInfo.fGrContext, SkBudgeted::kYes,
|
2016-03-24 01:59:25 +00:00
|
|
|
SkImageInfo::MakeN32Premul(100, 100)));
|
2016-01-05 16:39:28 +00:00
|
|
|
test_large_blur_input(reporter, surface->getCanvas());
|
|
|
|
}
|
2014-02-03 22:36:39 +00:00
|
|
|
#endif
|