diff options
| author |  Florin Malita <fmalita@chromium.org> | 2016-12-19 10:55:41 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-12-19 17:23:22 +0000 |
| commit | d1c550e71fa72cfbf03b93c10ec8b9d1d109f8c2 (patch) | |
| tree | 70db89d25cdf10c3ce0fc63becdf91ebd3808e7b /src/core/SkBitmapProcState_matrix.h | |
| parent | 98624d249d279f68127c76754d542ab5cd0f8eab (diff) | |
Consolidate TILEX_LOW_BITS/TILEY_LOW_BITS -> EXTRACT_LOW_BITS
R=reed@google.com
CQ_INCLUDE_TRYBOTS=skia.primary:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD
Change-Id: I5450d1ae3239c9d4e70502fc042222410ac77e72
Reviewed-on: https://skia-review.googlesource.com/6265
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Florin Malita <fmalita@chromium.org>
Diffstat (limited to 'src/core/SkBitmapProcState_matrix.h')
| -rw-r--r-- | src/core/SkBitmapProcState_matrix.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/core/SkBitmapProcState_matrix.h b/src/core/SkBitmapProcState_matrix.h index 7e2e44bcee..e0180c6a5c 100644 --- a/src/core/SkBitmapProcState_matrix.h +++ b/src/core/SkBitmapProcState_matrix.h @@ -35,14 +35,14 @@ void PERSP_FILTER_NAME(const SkBitmapProcState& s, static inline uint32_t PACK_FILTER_Y_NAME(SkFixed f, unsigned max, SkFixed one PREAMBLE_PARAM_Y) { unsigned i = TILEY_PROCF(f, max); - i = (i << 4) | TILEY_LOW_BITS(f, max); + i = (i << 4) | EXTRACT_LOW_BITS(f, max); return (i << 14) | (TILEY_PROCF((f + one), max)); } static inline uint32_t PACK_FILTER_X_NAME(SkFixed f, unsigned max, SkFixed one PREAMBLE_PARAM_X) { unsigned i = TILEX_PROCF(f, max); - i = (i << 4) | TILEX_LOW_BITS(f, max); + i = (i << 4) | EXTRACT_LOW_BITS(f, max); return (i << 14) | (TILEX_PROCF((f + one), max)); } @@ -155,5 +155,4 @@ void PERSP_FILTER_NAME(const SkBitmapProcState& s, #undef PREAMBLE_ARG_X #undef PREAMBLE_ARG_Y -#undef TILEX_LOW_BITS -#undef TILEY_LOW_BITS +#undef EXTRACT_LOW_BITS |