From 0f1fef834c73cb4f38023de0f98d05562d24f2bc Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Sat, 19 Apr 2014 22:12:35 +0000 Subject: [PATCH] inline SkMulDiv now that 64bit mul is inlineable TBR=caryclark@google.com Author: reed@google.com Review URL: https://codereview.chromium.org/242493006 git-svn-id: http://skia.googlecode.com/svn/trunk@14268 2bbb7eff-a529-9590-31e7-b0007b416f81 --- include/core/SkMath.h | 51 ++++++++++++++++++++++++------------------- src/core/SkMath.cpp | 7 ------ 2 files changed, 28 insertions(+), 30 deletions(-) diff --git a/include/core/SkMath.h b/include/core/SkMath.h index ba6223ed06..9d4c9eae35 100644 --- a/include/core/SkMath.h +++ b/include/core/SkMath.h @@ -12,29 +12,6 @@ #include "SkTypes.h" -/** - * Computes numer1 * numer2 / denom in full 64 intermediate precision. - * It is an error for denom to be 0. There is no special handling if - * the result overflows 32bits. - */ -int32_t SkMulDiv(int32_t numer1, int32_t numer2, int32_t denom); - -/** - * Computes (numer1 << shift) / denom in full 64 intermediate precision. - * It is an error for denom to be 0. There is no special handling if - * the result overflows 32bits. - */ -int32_t SkDivBits(int32_t numer, int32_t denom, int shift); - -/** - * Return the integer square root of value, with a bias of bitBias - */ -int32_t SkSqrtBits(int32_t value, int bitBias); - -/** Return the integer square root of n, treated as a SkFixed (16.16) - */ -#define SkSqrt32(n) SkSqrtBits(n, 15) - // 64bit -> 32bit utilities /** @@ -63,6 +40,34 @@ static inline int64_t sk_64_mul(int64_t a, int64_t b) { /////////////////////////////////////////////////////////////////////////////// +/** + * Computes numer1 * numer2 / denom in full 64 intermediate precision. + * It is an error for denom to be 0. There is no special handling if + * the result overflows 32bits. + */ +static inline int32_t SkMulDiv(int32_t numer1, int32_t numer2, int32_t denom) { + SkASSERT(denom); + + int64_t tmp = sk_64_mul(numer1, numer2) / denom; + return sk_64_asS32(tmp); +} + +/** + * Computes (numer1 << shift) / denom in full 64 intermediate precision. + * It is an error for denom to be 0. There is no special handling if + * the result overflows 32bits. + */ +int32_t SkDivBits(int32_t numer, int32_t denom, int shift); + +/** + * Return the integer square root of value, with a bias of bitBias + */ +int32_t SkSqrtBits(int32_t value, int bitBias); + +/** Return the integer square root of n, treated as a SkFixed (16.16) + */ +#define SkSqrt32(n) SkSqrtBits(n, 15) + //! Returns the number of leading zero bits (0...32) int SkCLZ_portable(uint32_t); diff --git a/src/core/SkMath.cpp b/src/core/SkMath.cpp index 25ac9aa936..aeacebecd4 100644 --- a/src/core/SkMath.cpp +++ b/src/core/SkMath.cpp @@ -43,13 +43,6 @@ int SkCLZ_portable(uint32_t x) { return zeros; } -int32_t SkMulDiv(int32_t numer1, int32_t numer2, int32_t denom) { - SkASSERT(denom); - - int64_t tmp = sk_64_mul(numer1, numer2) / denom; - return sk_64_asS32(tmp); -} - SkFixed SkFixedMul_portable(SkFixed a, SkFixed b) { #if defined(SkLONGLONG) return static_cast((int64_t)a * b >> 16);