diff options
author | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-12-20 14:24:21 +0000 |
---|---|---|
committer | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-12-20 14:24:21 +0000 |
commit | 01c41a556e0ef0ae2338a1b5ae110a501e1ed0a8 (patch) | |
tree | 161c3eeed7af2413719cd04c5cb9a627ffcc2537 /tests/MathTest.cpp | |
parent | 5f2fd5dd5d6dbf3057258d652aacfc9d664132a2 (diff) |
Revert "Revert "begin to remove SkLONGLONG and wean Skia off of Sk64""
This reverts commit 15b986baf026a3da5e2cac8106a1b753df242c39.
BUG=
Review URL: https://codereview.chromium.org/119353003
git-svn-id: http://skia.googlecode.com/svn/trunk@12796 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'tests/MathTest.cpp')
-rw-r--r-- | tests/MathTest.cpp | 38 |
1 files changed, 1 insertions, 37 deletions
diff --git a/tests/MathTest.cpp b/tests/MathTest.cpp index 1b8954a361..8cba67dd3d 100644 --- a/tests/MathTest.cpp +++ b/tests/MathTest.cpp @@ -188,28 +188,6 @@ static void test_blend(skiatest::Reporter* reporter) { } } -#if defined(SkLONGLONG) -static int symmetric_fixmul(int a, int b) { - int sa = SkExtractSign(a); - int sb = SkExtractSign(b); - - a = SkApplySign(a, sa); - b = SkApplySign(b, sb); - -#if 1 - int c = (int)(((SkLONGLONG)a * b) >> 16); - - return SkApplySign(c, sa ^ sb); -#else - SkLONGLONG ab = (SkLONGLONG)a * b; - if (sa ^ sb) { - ab = -ab; - } - return ab >> 16; -#endif -} -#endif - static void check_length(skiatest::Reporter* reporter, const SkPoint& p, SkScalar targetLen) { float x = SkScalarToFloat(p.fX); @@ -492,12 +470,11 @@ DEF_TEST(Math, reporter) { unittest_fastfloat(reporter); unittest_isfinite(reporter); -#ifdef SkLONGLONG for (i = 0; i < 10000; i++) { SkFixed numer = rand.nextS(); SkFixed denom = rand.nextS(); SkFixed result = SkFixedDiv(numer, denom); - SkLONGLONG check = ((SkLONGLONG)numer << 16) / denom; + int64_t check = ((int64_t)numer << 16) / denom; (void)SkCLZ(numer); (void)SkCLZ(denom); @@ -509,20 +486,7 @@ DEF_TEST(Math, reporter) { check = SK_MinS32; } REPORTER_ASSERT(reporter, result == (int32_t)check); - - // make them <= 2^24, so we don't overflow in fixmul - numer = numer << 8 >> 8; - denom = denom << 8 >> 8; - - result = SkFixedMul(numer, denom); - SkFixed r2 = symmetric_fixmul(numer, denom); - // SkASSERT(result == r2); - - result = SkFixedMul(numer, numer); - r2 = SkFixedSquare(numer); - REPORTER_ASSERT(reporter, result == r2); } -#endif test_blend(reporter); |