diff options
Diffstat (limited to 'bench')
| -rw-r--r-- | bench/ImageFilterDAGBench.cpp | 8 | ||||
| -rw-r--r-- | bench/MergeBench.cpp | 2 |
2 files changed, 3 insertions, 7 deletions
diff --git a/bench/ImageFilterDAGBench.cpp b/bench/ImageFilterDAGBench.cpp index 350510bf9d..aa65a1e0fd 100644 --- a/bench/ImageFilterDAGBench.cpp +++ b/bench/ImageFilterDAGBench.cpp @@ -32,13 +32,11 @@ protected: 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)); + paint.setImageFilter(SkMergeImageFilter::Make(inputs, kNumInputs)); canvas->drawRect(rect, paint); } } @@ -71,12 +69,10 @@ protected: 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); + sk_sp<SkImageFilter> mergeFilter = SkMergeImageFilter::Make(inputs, kNumInputs); image = image->makeWithFilter(mergeFilter.get(), subset, subset, &discardSubset, &offset); SkASSERT(image && image->dimensions() == fImage->dimensions()); diff --git a/bench/MergeBench.cpp b/bench/MergeBench.cpp index c37d198f7b..10aa8b8e03 100644 --- a/bench/MergeBench.cpp +++ b/bench/MergeBench.cpp @@ -81,7 +81,7 @@ protected: private: sk_sp<SkImageFilter> mergeBitmaps() { return SkMergeImageFilter::Make(SkImageSource::Make(fCheckerboard), - SkImageSource::Make(fImage), SkBlendMode::kSrcOver); + SkImageSource::Make(fImage)); } bool fIsSmall; |