diff options
author | mtklein <mtklein@chromium.org> | 2016-07-15 07:00:11 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-07-15 07:00:11 -0700 |
commit | 58e389b0518b46bbe58ba01c23443cf23c18435c (patch) | |
tree | 51f6d91fa6a116666c9c318897211cbc7ca0395b /src/core/SkMipMap.cpp | |
parent | 428036621e1667b504051872869ac38cf6fac9c8 (diff) |
Expand _01 half<->float limitation to _finite. Simplify.
It's become clear we need to sometimes deal with values <0 or >1.
I'm not yet convinced we care about NaN or +-inf.
We had some fairly clever tricks and optimizations here for NEON
and SSE. I've thrown them out in favor of a single implementation.
If we find the specializations mattered, we can certainly figure out
how to extend them to this new range/domain.
This happens to add a vectorized float -> half for ARMv7, which was
missing from the _01 version. (The SSE strategy was not portable to
platforms that flush denorm floats to zero.)
I've tested the full float range for FloatToHalf on my desktop and a 5x.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2145663003
CQ_INCLUDE_TRYBOTS=client.skia:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD-Trybot;master.client.skia:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD-Trybot,Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Fast-Trybot
Committed: https://skia.googlesource.com/skia/+/3296bee70d074bb8094b3229dbe12fa016657e90
Review-Url: https://codereview.chromium.org/2145663003
Diffstat (limited to 'src/core/SkMipMap.cpp')
-rw-r--r-- | src/core/SkMipMap.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/SkMipMap.cpp b/src/core/SkMipMap.cpp index f469762eba..4811c9e073 100644 --- a/src/core/SkMipMap.cpp +++ b/src/core/SkMipMap.cpp @@ -85,10 +85,10 @@ struct ColorTypeFilter_8 { struct ColorTypeFilter_F16 { typedef uint64_t Type; // SkHalf x4 static Sk4f Expand(uint64_t x) { - return SkHalfToFloat_01(x); + return SkHalfToFloat_finite(x); } static uint64_t Compact(const Sk4f& x) { - return SkFloatToHalf_01(x); + return SkFloatToHalf_finite(x); } }; |