diff options
| author |  reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-12-17 16:44:46 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-12-17 16:44:46 +0000 |
| commit | 8f4d2306fa866a26f9448048ff63f692b2ba43aa (patch) | |
| tree | 7a48d817cb5220f87e81781320b002eead2495a0 /bench | |
| parent | a34b638b909f58dd7c66546a0f49923112f7f785 (diff) | |
remove SK_SCALAR_IS_[FLOAT,FIXED] and assume floats
To keep the CL (slightly) managable, this does not make any changes to
existing macros (e.g. SkScalarMul). Just tackling #ifdef constructs this
time around.
BUG=
R=bsalomon@google.com, caryclark@google.com
Review URL: https://codereview.chromium.org/117053002
git-svn-id: http://skia.googlecode.com/svn/trunk@12712 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'bench')
| -rw-r--r-- | bench/MorphologyBench.cpp | 4 | ||||
| -rw-r--r-- | bench/benchmain.cpp | 6 |
2 files changed, 0 insertions, 10 deletions
diff --git a/bench/MorphologyBench.cpp b/bench/MorphologyBench.cpp index 63171c2c12..97f3b88284 100644 --- a/bench/MorphologyBench.cpp +++ b/bench/MorphologyBench.cpp @@ -84,9 +84,6 @@ private: typedef SkBenchmark INHERITED; }; -// Fixed point can be 100x slower than float on these tests, causing -// bench to timeout. -#ifndef SK_SCALAR_IS_FIXED DEF_BENCH( return new MorphologyBench(SMALL, kErode_MT); ) DEF_BENCH( return new MorphologyBench(SMALL, kDilate_MT); ) @@ -97,4 +94,3 @@ DEF_BENCH( return new MorphologyBench(REAL, kErode_MT); ) DEF_BENCH( return new MorphologyBench(REAL, kDilate_MT); ) DEF_BENCH( return new MorphologyBench(0, kErode_MT); ) -#endif diff --git a/bench/benchmain.cpp b/bench/benchmain.cpp index 092a577c61..695ac7eba6 100644 --- a/bench/benchmain.cpp +++ b/bench/benchmain.cpp @@ -407,12 +407,6 @@ int tool_main(int argc, char** argv) { writer.option("scale", SkStringPrintf("%d", FLAGS_scale).c_str()); writer.option("clip", SkStringPrintf("%d", FLAGS_clip).c_str()); -#if defined(SK_SCALAR_IS_FIXED) - writer.option("scalar", "fixed"); -#else - writer.option("scalar", "float"); -#endif - #if defined(SK_BUILD_FOR_WIN32) writer.option("system", "WIN32"); #elif defined(SK_BUILD_FOR_MAC) |