a24712e4dc
This reverts commit 29a4a684af.
Reason for revert: some configs fail
Original change's description:
> makeSurface defaults to raster
>
> Rather that returning nullptr for a recording
> canvas, return a raster canvas instead.
>
> R=reed@google.com,robertphillips@google.com
>
> Bug: skia:
> Change-Id: I211d8ef368b9aec6d14cc72d1652ac6a03f3fa7b
> Reviewed-on: https://skia-review.googlesource.com/151666
> Commit-Queue: Cary Clark <caryclark@skia.org>
> Reviewed-by: Robert Phillips <robertphillips@google.com>
TBR=robertphillips@google.com,reed@google.com,caryclark@skia.org
Change-Id: I82d2c3e4589a2ca8523bbf86884ed68b1431631d
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/151824
Reviewed-by: Cary Clark <caryclark@google.com>
Commit-Queue: Cary Clark <caryclark@google.com>
104 lines
3.1 KiB
C++
104 lines
3.1 KiB
C++
/*
|
|
* Copyright 2017 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
|
|
#include "gm.h"
|
|
#include "sk_tool_utils.h"
|
|
#include "SkSurface.h"
|
|
#include "SkBlurImageFilter.h"
|
|
|
|
static sk_sp<SkImage> make_image(SkCanvas* canvas) {
|
|
SkImageInfo info = SkImageInfo::MakeN32Premul(250, 200);
|
|
auto surface = sk_tool_utils::makeSurface(canvas, info);
|
|
SkCanvas* c = surface->getCanvas();
|
|
SkPaint paint;
|
|
paint.setAntiAlias(true);
|
|
|
|
paint.setColor(SK_ColorBLUE);
|
|
c->drawRect(SkRect::MakeIWH(info.width(), info.height()), paint);
|
|
paint.setColor(SK_ColorGREEN);
|
|
c->drawCircle(125, 100, 100, paint);
|
|
paint.setColor(SK_ColorRED);
|
|
c->drawRect(SkRect::MakeIWH(80, 80), paint);
|
|
|
|
return surface->makeImageSnapshot();
|
|
}
|
|
|
|
static void draw_image(SkCanvas* canvas, const sk_sp<SkImage> image, sk_sp<SkImageFilter> filter) {
|
|
SkAutoCanvasRestore acr(canvas, true);
|
|
SkPaint paint;
|
|
paint.setImageFilter(std::move(filter));
|
|
|
|
canvas->translate(SkIntToScalar(30), 0);
|
|
canvas->clipRect(SkRect::MakeIWH(image->width(),image->height()));
|
|
canvas->drawImage(image, 0, 0, &paint);
|
|
}
|
|
|
|
namespace skiagm {
|
|
|
|
// This GM draws one rectangle, one green inscribed circle, and one red square
|
|
// with different blur settings.
|
|
class ImageBlurClampModeGM : public GM {
|
|
public:
|
|
ImageBlurClampModeGM() {
|
|
this->setBGColor(0xFFCCCCCC);
|
|
}
|
|
|
|
protected:
|
|
|
|
SkString onShortName() override {
|
|
return SkString("imageblurclampmode");
|
|
}
|
|
|
|
SkISize onISize() override {
|
|
return SkISize::Make(850, 920);
|
|
}
|
|
|
|
bool runAsBench() const override { return true; }
|
|
|
|
void onDraw(SkCanvas* canvas) override {
|
|
sk_sp<SkImage> image(make_image(canvas));
|
|
sk_sp<SkImageFilter> filter;
|
|
|
|
canvas->translate(0, 30);
|
|
// Test different kernel size, including the one to launch 2d Gaussian
|
|
// blur.
|
|
for (auto sigma: { 0.6f, 3.0f, 8.0f, 20.0f }) {
|
|
canvas->save();
|
|
|
|
// x-only blur
|
|
filter = SkBlurImageFilter::Make(sigma, 0.0f, nullptr, nullptr,
|
|
SkBlurImageFilter::kClamp_TileMode);
|
|
draw_image(canvas, image, std::move(filter));
|
|
canvas->translate(image->width() + 20, 0);
|
|
|
|
// y-only blur
|
|
filter = SkBlurImageFilter::Make(0.0f, sigma, nullptr, nullptr,
|
|
SkBlurImageFilter::kClamp_TileMode);
|
|
draw_image(canvas, image, std::move(filter));
|
|
canvas->translate(image->width() + 20, 0);
|
|
|
|
// both directions
|
|
filter = SkBlurImageFilter::Make(sigma, sigma, nullptr, nullptr,
|
|
SkBlurImageFilter::kClamp_TileMode);
|
|
draw_image(canvas, image, std::move(filter));
|
|
canvas->translate(image->width() + 20, 0);
|
|
|
|
canvas->restore();
|
|
|
|
canvas->translate(0, image->height() + 20);
|
|
}
|
|
}
|
|
|
|
private:
|
|
typedef GM INHERITED;
|
|
};
|
|
|
|
//////////////////////////////////////////////////////////////////////////////
|
|
|
|
DEF_GM(return new ImageBlurClampModeGM;)
|
|
}
|