From 8f4d2306fa866a26f9448048ff63f692b2ba43aa Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Tue, 17 Dec 2013 16:44:46 +0000 Subject: 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 --- bench/MorphologyBench.cpp | 4 ---- 1 file changed, 4 deletions(-) (limited to 'bench/MorphologyBench.cpp') 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 -- cgit v1.2.3