38aad81a54
This reverts commit 9ff301bf91.
Reason for revert: need to update G3, Flutter.
Original change's description:
> Remove SkLights include from SkCanvas.h
>
> SkLights.h pulls in a bunch of other headers and is not needed (fwdecl
> works fine).
>
> Change-Id: Id2d7176eb3bf4609f72f46d513eebf59318f542f
> Reviewed-on: https://skia-review.googlesource.com/14904
> Reviewed-by: Mike Reed <reed@google.com>
> Commit-Queue: Florin Malita <fmalita@chromium.org>
>
TBR=mtklein@google.com,fmalita@chromium.org,reed@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Change-Id: I4799ad5b31aaeaf529c8b912bbe09aa8869a5e6c
Reviewed-on: https://skia-review.googlesource.com/15107
Reviewed-by: Florin Malita <fmalita@chromium.org>
Commit-Queue: Florin Malita <fmalita@chromium.org>
126 lines
3.9 KiB
C++
126 lines
3.9 KiB
C++
/*
|
|
* Copyright 2014 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
|
|
#include "Benchmark.h"
|
|
#include "Resources.h"
|
|
#include "SkBlurImageFilter.h"
|
|
#include "SkDisplacementMapEffect.h"
|
|
#include "SkCanvas.h"
|
|
#include "SkMergeImageFilter.h"
|
|
|
|
|
|
// Exercise a blur filter connected to 5 inputs of the same merge filter.
|
|
// This bench shows an improvement in performance once cacheing of re-used
|
|
// nodes is implemented, since the DAG is no longer flattened to a tree.
|
|
class ImageFilterDAGBench : public Benchmark {
|
|
public:
|
|
ImageFilterDAGBench() {}
|
|
|
|
protected:
|
|
const char* onGetName() override {
|
|
return "image_filter_dag";
|
|
}
|
|
|
|
void onDraw(int loops, SkCanvas* canvas) override {
|
|
const SkRect rect = SkRect::Make(SkIRect::MakeWH(400, 400));
|
|
|
|
for (int j = 0; j < loops; j++) {
|
|
sk_sp<SkImageFilter> blur(SkBlurImageFilter::Make(20.0f, 20.0f, nullptr));
|
|
sk_sp<SkImageFilter> inputs[kNumInputs];
|
|
SkBlendMode modes[kNumInputs];
|
|
for (int i = 0; i < kNumInputs; ++i) {
|
|
inputs[i] = blur;
|
|
modes[i] = SkBlendMode::kSrcOver;
|
|
}
|
|
SkPaint paint;
|
|
paint.setImageFilter(SkMergeImageFilter::MakeN(inputs, kNumInputs, modes));
|
|
canvas->drawRect(rect, paint);
|
|
}
|
|
}
|
|
|
|
private:
|
|
static const int kNumInputs = 5;
|
|
|
|
typedef Benchmark INHERITED;
|
|
};
|
|
|
|
class ImageMakeWithFilterDAGBench : public Benchmark {
|
|
public:
|
|
ImageMakeWithFilterDAGBench() {}
|
|
|
|
protected:
|
|
const char* onGetName() override {
|
|
return "image_make_with_filter_dag";
|
|
}
|
|
|
|
void onDelayedSetup() override {
|
|
fImage = GetResourceAsImage("mandrill_512.png");
|
|
}
|
|
|
|
void onDraw(int loops, SkCanvas* canvas) override {
|
|
SkIRect subset = SkIRect::MakeSize(fImage->dimensions());
|
|
SkIPoint offset = SkIPoint::Make(0, 0);
|
|
SkIRect discardSubset;
|
|
sk_sp<SkImage> image = fImage;
|
|
|
|
for (int j = 0; j < loops; j++) {
|
|
sk_sp<SkImageFilter> blur(SkBlurImageFilter::Make(20.0f, 20.0f, nullptr));
|
|
sk_sp<SkImageFilter> inputs[kNumInputs];
|
|
SkBlendMode modes[kNumInputs];
|
|
for (int i = 0; i < kNumInputs; ++i) {
|
|
inputs[i] = blur;
|
|
modes[i] = SkBlendMode::kSrcOver;
|
|
}
|
|
sk_sp<SkImageFilter> mergeFilter = SkMergeImageFilter::MakeN(inputs, kNumInputs, modes);
|
|
image = image->makeWithFilter(mergeFilter.get(), subset, subset, &discardSubset,
|
|
&offset);
|
|
SkASSERT(image && image->dimensions() == fImage->dimensions());
|
|
}
|
|
}
|
|
|
|
private:
|
|
static const int kNumInputs = 5;
|
|
sk_sp<SkImage> fImage;
|
|
|
|
typedef Benchmark INHERITED;
|
|
};
|
|
|
|
// Exercise a blur filter connected to both inputs of an SkDisplacementMapEffect.
|
|
|
|
class ImageFilterDisplacedBlur : public Benchmark {
|
|
public:
|
|
ImageFilterDisplacedBlur() {}
|
|
|
|
protected:
|
|
const char* onGetName() override {
|
|
return "image_filter_displaced_blur";
|
|
}
|
|
|
|
void onDraw(int loops, SkCanvas* canvas) override {
|
|
for (int j = 0; j < loops; j++) {
|
|
sk_sp<SkImageFilter> blur(SkBlurImageFilter::Make(4.0f, 4.0f, nullptr));
|
|
auto xSelector = SkDisplacementMapEffect::kR_ChannelSelectorType;
|
|
auto ySelector = SkDisplacementMapEffect::kB_ChannelSelectorType;
|
|
SkScalar scale = 2;
|
|
|
|
SkPaint paint;
|
|
paint.setImageFilter(SkDisplacementMapEffect::Make(xSelector, ySelector, scale,
|
|
blur, blur));
|
|
|
|
SkRect rect = SkRect::Make(SkIRect::MakeWH(400, 400));
|
|
canvas->drawRect(rect, paint);
|
|
}
|
|
}
|
|
|
|
private:
|
|
typedef Benchmark INHERITED;
|
|
};
|
|
|
|
DEF_BENCH(return new ImageFilterDAGBench;)
|
|
DEF_BENCH(return new ImageMakeWithFilterDAGBench;)
|
|
DEF_BENCH(return new ImageFilterDisplacedBlur;)
|