From 7d954ad797176afedb9262fdea4507d0fc60eb9d Mon Sep 17 00:00:00 2001 From: Mike Reed Date: Fri, 28 Oct 2016 15:42:34 -0400 Subject: remove xfermode from public api BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4020 CQ_INCLUDE_TRYBOTS=master.client.skia:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD-Trybot Change-Id: I19cd056f2af778f10e8c6c2b7b2735593b43dbac Reviewed-on: https://skia-review.googlesource.com/4020 Reviewed-by: Florin Malita Reviewed-by: Mike Klein Commit-Queue: Mike Reed --- bench/ImageFilterDAGBench.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'bench/ImageFilterDAGBench.cpp') diff --git a/bench/ImageFilterDAGBench.cpp b/bench/ImageFilterDAGBench.cpp index 60bcb62dd8..719e87b58d 100644 --- a/bench/ImageFilterDAGBench.cpp +++ b/bench/ImageFilterDAGBench.cpp @@ -31,11 +31,13 @@ protected: for (int j = 0; j < loops; j++) { sk_sp blur(SkBlurImageFilter::Make(20.0f, 20.0f, nullptr)); sk_sp inputs[kNumInputs]; + SkBlendMode modes[kNumInputs]; for (int i = 0; i < kNumInputs; ++i) { inputs[i] = blur; + modes[i] = SkBlendMode::kSrcOver; } SkPaint paint; - paint.setImageFilter(SkMergeImageFilter::Make(inputs, kNumInputs)); + paint.setImageFilter(SkMergeImageFilter::MakeN(inputs, kNumInputs, modes)); canvas->drawRect(rect, paint); } } @@ -68,10 +70,12 @@ protected: for (int j = 0; j < loops; j++) { sk_sp blur(SkBlurImageFilter::Make(20.0f, 20.0f, nullptr)); sk_sp inputs[kNumInputs]; + SkBlendMode modes[kNumInputs]; for (int i = 0; i < kNumInputs; ++i) { inputs[i] = blur; + modes[i] = SkBlendMode::kSrcOver; } - sk_sp mergeFilter = SkMergeImageFilter::Make(inputs, kNumInputs); + sk_sp mergeFilter = SkMergeImageFilter::MakeN(inputs, kNumInputs, modes); image = image->makeWithFilter(mergeFilter.get(), subset, subset, &discardSubset, &offset); SkASSERT(image && image->dimensions() == fImage->dimensions()); -- cgit v1.2.3