diff options
author | mtklein@google.com <mtklein@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-09-13 19:52:27 +0000 |
---|---|---|
committer | mtklein@google.com <mtklein@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-09-13 19:52:27 +0000 |
commit | 410e6e80f00a6c660675c80904807a041c7b7d2a (patch) | |
tree | e6b7287001f032ae9a9e09de19db5d0867bea9e3 /bench/GradientBench.cpp | |
parent | af54a513a5b7723b53f61730afe0ad6256881749 (diff) |
Refactoring: get rid of the SkBenchmark void* parameter.
While I was doing massive sed-ing, I also converted every bench to use DEF_BENCH instead of registering the ugly manual way.
BUG=
R=scroggo@google.com
Review URL: https://codereview.chromium.org/23876006
git-svn-id: http://skia.googlecode.com/svn/trunk@11263 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'bench/GradientBench.cpp')
-rw-r--r-- | bench/GradientBench.cpp | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/bench/GradientBench.cpp b/bench/GradientBench.cpp index 8dec68bfc3..029c365071 100644 --- a/bench/GradientBench.cpp +++ b/bench/GradientBench.cpp @@ -165,13 +165,13 @@ class GradientBench : public SkBenchmark { H = 400, }; public: - GradientBench(void* param, GradType gradType, + GradientBench(GradType gradType, GradData data = gGradData[0], SkShader::TileMode tm = SkShader::kClamp_TileMode, GeomType geomType = kRect_GeomType, float scale = 1.0f ) - : INHERITED(param) { + { fName.printf("gradient_%s_%s", gGrads[gradType].fName, tilemodename(tm)); if (geomType != kRect_GeomType) { @@ -230,7 +230,7 @@ class Gradient2Bench : public SkBenchmark { bool fHasAlpha; public: - Gradient2Bench(void* param, bool hasAlpha) : INHERITED(param) { + Gradient2Bench(bool hasAlpha) { fName.printf("gradient_create_%s", hasAlpha ? "alpha" : "opaque"); fHasAlpha = hasAlpha; } @@ -269,26 +269,26 @@ private: typedef SkBenchmark INHERITED; }; -DEF_BENCH( return new GradientBench(p, kLinear_GradType); ) -DEF_BENCH( return new GradientBench(p, kLinear_GradType, gGradData[1]); ) -DEF_BENCH( return new GradientBench(p, kLinear_GradType, gGradData[0], SkShader::kMirror_TileMode); ) +DEF_BENCH( return new GradientBench(kLinear_GradType); ) +DEF_BENCH( return new GradientBench(kLinear_GradType, gGradData[1]); ) +DEF_BENCH( return new GradientBench(kLinear_GradType, gGradData[0], SkShader::kMirror_TileMode); ) // Draw a radial gradient of radius 1/2 on a rectangle; half the lines should // be completely pinned, the other half should pe partially pinned -DEF_BENCH( return new GradientBench(p, kRadial_GradType, gGradData[0], SkShader::kClamp_TileMode, kRect_GeomType, 0.5f); ) +DEF_BENCH( return new GradientBench(kRadial_GradType, gGradData[0], SkShader::kClamp_TileMode, kRect_GeomType, 0.5f); ) // Draw a radial gradient on a circle of equal size; all the lines should // hit the unpinned fast path (so long as GradientBench.W == H) -DEF_BENCH( return new GradientBench(p, kRadial_GradType, gGradData[0], SkShader::kClamp_TileMode, kOval_GeomType); ) - -DEF_BENCH( return new GradientBench(p, kRadial_GradType, gGradData[0], SkShader::kMirror_TileMode); ) -DEF_BENCH( return new GradientBench(p, kSweep_GradType); ) -DEF_BENCH( return new GradientBench(p, kSweep_GradType, gGradData[1]); ) -DEF_BENCH( return new GradientBench(p, kRadial2_GradType); ) -DEF_BENCH( return new GradientBench(p, kRadial2_GradType, gGradData[1]); ) -DEF_BENCH( return new GradientBench(p, kRadial2_GradType, gGradData[0], SkShader::kMirror_TileMode); ) -DEF_BENCH( return new GradientBench(p, kConical_GradType); ) -DEF_BENCH( return new GradientBench(p, kConical_GradType, gGradData[1]); ) - -DEF_BENCH( return new Gradient2Bench(p, false); ) -DEF_BENCH( return new Gradient2Bench(p, true); ) +DEF_BENCH( return new GradientBench(kRadial_GradType, gGradData[0], SkShader::kClamp_TileMode, kOval_GeomType); ) + +DEF_BENCH( return new GradientBench(kRadial_GradType, gGradData[0], SkShader::kMirror_TileMode); ) +DEF_BENCH( return new GradientBench(kSweep_GradType); ) +DEF_BENCH( return new GradientBench(kSweep_GradType, gGradData[1]); ) +DEF_BENCH( return new GradientBench(kRadial2_GradType); ) +DEF_BENCH( return new GradientBench(kRadial2_GradType, gGradData[1]); ) +DEF_BENCH( return new GradientBench(kRadial2_GradType, gGradData[0], SkShader::kMirror_TileMode); ) +DEF_BENCH( return new GradientBench(kConical_GradType); ) +DEF_BENCH( return new GradientBench(kConical_GradType, gGradData[1]); ) + +DEF_BENCH( return new Gradient2Bench(false); ) +DEF_BENCH( return new Gradient2Bench(true); ) |