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/LightingBench.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/LightingBench.cpp')
-rw-r--r-- | bench/LightingBench.cpp | 39 |
1 files changed, 19 insertions, 20 deletions
diff --git a/bench/LightingBench.cpp b/bench/LightingBench.cpp index 37c098b2f6..7a1b5998d8 100644 --- a/bench/LightingBench.cpp +++ b/bench/LightingBench.cpp @@ -17,8 +17,7 @@ class LightingBaseBench : public SkBenchmark { public: - LightingBaseBench(void* param, bool small) : INHERITED(param), fIsSmall(small) { - } + LightingBaseBench(bool small) : fIsSmall(small) { } protected: void draw(SkCanvas* canvas, SkImageFilter* imageFilter) const { @@ -98,7 +97,7 @@ protected: class LightingPointLitDiffuseBench : public LightingBaseBench { public: - LightingPointLitDiffuseBench(void* param, bool small) : INHERITED(param, small) { + LightingPointLitDiffuseBench(bool small) : INHERITED(small) { } protected: @@ -117,7 +116,7 @@ private: class LightingDistantLitDiffuseBench : public LightingBaseBench { public: - LightingDistantLitDiffuseBench(void* param, bool small) : INHERITED(param, small) { + LightingDistantLitDiffuseBench(bool small) : INHERITED(small) { } protected: @@ -136,7 +135,7 @@ private: class LightingSpotLitDiffuseBench : public LightingBaseBench { public: - LightingSpotLitDiffuseBench(void* param, bool small) : INHERITED(param, small) { + LightingSpotLitDiffuseBench(bool small) : INHERITED(small) { } protected: @@ -156,7 +155,7 @@ private: class LightingPointLitSpecularBench : public LightingBaseBench { public: - LightingPointLitSpecularBench(void* param, bool small) : INHERITED(param, small) { + LightingPointLitSpecularBench(bool small) : INHERITED(small) { } protected: @@ -175,7 +174,7 @@ private: class LightingDistantLitSpecularBench : public LightingBaseBench { public: - LightingDistantLitSpecularBench(void* param, bool small) : INHERITED(param, small) { + LightingDistantLitSpecularBench(bool small) : INHERITED(small) { } protected: @@ -194,7 +193,7 @@ private: class LightingSpotLitSpecularBench : public LightingBaseBench { public: - LightingSpotLitSpecularBench(void* param, bool small) : INHERITED(param, small) { + LightingSpotLitSpecularBench(bool small) : INHERITED(small) { } protected: @@ -214,15 +213,15 @@ private: /////////////////////////////////////////////////////////////////////////////// -DEF_BENCH( return new LightingPointLitDiffuseBench(p, true); ) -DEF_BENCH( return new LightingPointLitDiffuseBench(p, false); ) -DEF_BENCH( return new LightingDistantLitDiffuseBench(p, true); ) -DEF_BENCH( return new LightingDistantLitDiffuseBench(p, false); ) -DEF_BENCH( return new LightingSpotLitDiffuseBench(p, true); ) -DEF_BENCH( return new LightingSpotLitDiffuseBench(p, false); ) -DEF_BENCH( return new LightingPointLitSpecularBench(p, true); ) -DEF_BENCH( return new LightingPointLitSpecularBench(p, false); ) -DEF_BENCH( return new LightingDistantLitSpecularBench(p, true); ) -DEF_BENCH( return new LightingDistantLitSpecularBench(p, false); ) -DEF_BENCH( return new LightingSpotLitSpecularBench(p, true); ) -DEF_BENCH( return new LightingSpotLitSpecularBench(p, false); ) +DEF_BENCH( return new LightingPointLitDiffuseBench(true); ) +DEF_BENCH( return new LightingPointLitDiffuseBench(false); ) +DEF_BENCH( return new LightingDistantLitDiffuseBench(true); ) +DEF_BENCH( return new LightingDistantLitDiffuseBench(false); ) +DEF_BENCH( return new LightingSpotLitDiffuseBench(true); ) +DEF_BENCH( return new LightingSpotLitDiffuseBench(false); ) +DEF_BENCH( return new LightingPointLitSpecularBench(true); ) +DEF_BENCH( return new LightingPointLitSpecularBench(false); ) +DEF_BENCH( return new LightingDistantLitSpecularBench(true); ) +DEF_BENCH( return new LightingDistantLitSpecularBench(false); ) +DEF_BENCH( return new LightingSpotLitSpecularBench(true); ) +DEF_BENCH( return new LightingSpotLitSpecularBench(false); ) |