35c556f33e
This reverts commita53d999007. Reason for revert: Bug in SkNx_sse fixed. Original change's description: > Revert "Direct evaluation of gaussian" > > This reverts commit5e18cdea0a. > > Reason for revert: ASAN > Original change's description: > > Direct evaluation of gaussian > > > > The SVG(CSS) standard allows the 3 pass algorithm for sigma >= 2. But > > sigma < 2, the code must evaluate to the convolution. The old code used > > an interpolation scheme between windowed filters. This code directly > > evaluates the gaussian kernel for sigma < 2. > > > > This code produces cleaner results, is 25% faster, and does not use a > > temporary memory buffer. > > > > Change-Id: Ibd0caa73cadd06b637f55ba7bd4fefcfe7ac73db > > Reviewed-on: https://skia-review.googlesource.com/62540 > > Commit-Queue: Herb Derby <herb@google.com> > > Reviewed-by: Mike Klein <mtklein@google.com> > > TBR=mtklein@google.com,herb@google.com > > Change-Id: I936077dfa659d71bc361339d98340c55545a1eb8 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://skia-review.googlesource.com/72481 > Reviewed-by: Brian Osman <brianosman@google.com> > Commit-Queue: Brian Osman <brianosman@google.com> TBR=mtklein@google.com,herb@google.com,brianosman@google.com Change-Id: I4c30e3481308a8148d40223519e286885ec6f880 Reviewed-on: https://skia-review.googlesource.com/72900 Commit-Queue: Herb Derby <herb@google.com> Reviewed-by: Herb Derby <herb@google.com>
119 lines
4.0 KiB
C++
119 lines
4.0 KiB
C++
/*
|
|
* Copyright 2011 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 "SkBlurMask.h"
|
|
#include "SkBlurMaskFilter.h"
|
|
#include "SkCanvas.h"
|
|
#include "SkPaint.h"
|
|
#include "SkRandom.h"
|
|
#include "SkShader.h"
|
|
#include "SkString.h"
|
|
|
|
#define MINI 0.01f
|
|
#define SMALL SkIntToScalar(2)
|
|
#define REAL 0.5f
|
|
#define BIG SkIntToScalar(10)
|
|
#define REALBIG 100.5f
|
|
// The value that produces a sigma of just over 2.
|
|
#define CUTOVER 2.6f
|
|
|
|
static const char* gStyleName[] = {
|
|
"normal",
|
|
"solid",
|
|
"outer",
|
|
"inner"
|
|
};
|
|
|
|
class BlurBench : public Benchmark {
|
|
SkScalar fRadius;
|
|
SkBlurStyle fStyle;
|
|
uint32_t fFlags;
|
|
SkString fName;
|
|
|
|
public:
|
|
BlurBench(SkScalar rad, SkBlurStyle bs, uint32_t flags = 0) {
|
|
fRadius = rad;
|
|
fStyle = bs;
|
|
fFlags = flags;
|
|
const char* name = rad > 0 ? gStyleName[bs] : "none";
|
|
const char* quality = flags & SkBlurMaskFilter::kHighQuality_BlurFlag ? "high_quality"
|
|
: "low_quality";
|
|
if (SkScalarFraction(rad) != 0) {
|
|
fName.printf("blur_%.2f_%s_%s", SkScalarToFloat(rad), name, quality);
|
|
} else {
|
|
fName.printf("blur_%d_%s_%s", SkScalarRoundToInt(rad), name, quality);
|
|
}
|
|
}
|
|
|
|
protected:
|
|
virtual const char* onGetName() {
|
|
return fName.c_str();
|
|
}
|
|
|
|
virtual void onDraw(int loops, SkCanvas* canvas) {
|
|
SkPaint paint;
|
|
this->setupPaint(&paint);
|
|
|
|
paint.setAntiAlias(true);
|
|
|
|
SkRandom rand;
|
|
for (int i = 0; i < loops; i++) {
|
|
SkRect r = SkRect::MakeWH(rand.nextUScalar1() * 400,
|
|
rand.nextUScalar1() * 400);
|
|
r.offset(fRadius, fRadius);
|
|
|
|
if (fRadius > 0) {
|
|
paint.setMaskFilter(SkBlurMaskFilter::Make(fStyle,
|
|
SkBlurMask::ConvertRadiusToSigma(fRadius),
|
|
fFlags));
|
|
}
|
|
canvas->drawOval(r, paint);
|
|
}
|
|
}
|
|
|
|
private:
|
|
typedef Benchmark INHERITED;
|
|
};
|
|
|
|
DEF_BENCH(return new BlurBench(MINI, kNormal_SkBlurStyle);)
|
|
DEF_BENCH(return new BlurBench(MINI, kSolid_SkBlurStyle);)
|
|
DEF_BENCH(return new BlurBench(MINI, kOuter_SkBlurStyle);)
|
|
DEF_BENCH(return new BlurBench(MINI, kInner_SkBlurStyle);)
|
|
|
|
DEF_BENCH(return new BlurBench(SMALL, kNormal_SkBlurStyle);)
|
|
DEF_BENCH(return new BlurBench(SMALL, kSolid_SkBlurStyle);)
|
|
DEF_BENCH(return new BlurBench(SMALL, kOuter_SkBlurStyle);)
|
|
DEF_BENCH(return new BlurBench(SMALL, kInner_SkBlurStyle);)
|
|
|
|
DEF_BENCH(return new BlurBench(BIG, kNormal_SkBlurStyle);)
|
|
DEF_BENCH(return new BlurBench(BIG, kSolid_SkBlurStyle);)
|
|
DEF_BENCH(return new BlurBench(BIG, kOuter_SkBlurStyle);)
|
|
DEF_BENCH(return new BlurBench(BIG, kInner_SkBlurStyle);)
|
|
|
|
DEF_BENCH(return new BlurBench(REALBIG, kNormal_SkBlurStyle);)
|
|
DEF_BENCH(return new BlurBench(REALBIG, kSolid_SkBlurStyle);)
|
|
DEF_BENCH(return new BlurBench(REALBIG, kOuter_SkBlurStyle);)
|
|
DEF_BENCH(return new BlurBench(REALBIG, kInner_SkBlurStyle);)
|
|
|
|
DEF_BENCH(return new BlurBench(REAL, kNormal_SkBlurStyle);)
|
|
DEF_BENCH(return new BlurBench(REAL, kSolid_SkBlurStyle);)
|
|
DEF_BENCH(return new BlurBench(REAL, kOuter_SkBlurStyle);)
|
|
DEF_BENCH(return new BlurBench(REAL, kInner_SkBlurStyle);)
|
|
|
|
DEF_BENCH(return new BlurBench(MINI, kNormal_SkBlurStyle, SkBlurMaskFilter::kHighQuality_BlurFlag);)
|
|
|
|
DEF_BENCH(return new BlurBench(SMALL, kNormal_SkBlurStyle, SkBlurMaskFilter::kHighQuality_BlurFlag);)
|
|
|
|
DEF_BENCH(return new BlurBench(BIG, kNormal_SkBlurStyle, SkBlurMaskFilter::kHighQuality_BlurFlag);)
|
|
|
|
DEF_BENCH(return new BlurBench(REALBIG, kNormal_SkBlurStyle, SkBlurMaskFilter::kHighQuality_BlurFlag);)
|
|
|
|
DEF_BENCH(return new BlurBench(REAL, kNormal_SkBlurStyle, SkBlurMaskFilter::kHighQuality_BlurFlag);)
|
|
DEF_BENCH(return new BlurBench(CUTOVER, kNormal_SkBlurStyle, SkBlurMaskFilter::kHighQuality_BlurFlag);)
|
|
|
|
DEF_BENCH(return new BlurBench(0, kNormal_SkBlurStyle);)
|