Index: src/opts/SkPMFloat_SSSE3.h |
diff --git a/src/opts/SkPMFloat_SSSE3.h b/src/opts/SkPMFloat_SSSE3.h |
index b2c2b23429ef68da52b090e5e86e1c263577679b..ab54caf3d41acd80e64daf16ef83952a7d78567c 100644 |
--- a/src/opts/SkPMFloat_SSSE3.h |
+++ b/src/opts/SkPMFloat_SSSE3.h |
@@ -23,7 +23,8 @@ inline SkPMFloat::SkPMFloat(SkPMColor c) { |
inline SkPMColor SkPMFloat::get() const { |
SkASSERT(this->isValid()); |
const int _ = 255; // _ means to zero that byte. |
- __m128i fix8_32 = _mm_cvtps_epi32(fColors), // _mm_cvtps_epi32 rounds for us! |
+ // We don't use _mm_cvtps_epi32, because we want precise control over how 0.5 rounds (up). |
+ __m128i fix8_32 = _mm_cvttps_epi32(_mm_add_ps(_mm_set1_ps(0.5f), fColors)), |
fix8 = _mm_shuffle_epi8(fix8_32, _mm_set_epi8(_,_,_,_, _,_,_,_, _,_,_,_, 12,8,4,0)); |
SkPMColor c = _mm_cvtsi128_si32(fix8); |
SkPMColorAssert(c); |
@@ -31,7 +32,8 @@ inline SkPMColor SkPMFloat::get() const { |
} |
inline SkPMColor SkPMFloat::clamped() const { |
- __m128i fix8_32 = _mm_cvtps_epi32(fColors), // _mm_cvtps_epi32 rounds for us! |
+ // We don't use _mm_cvtps_epi32, because we want precise control over how 0.5 rounds (up). |
+ __m128i fix8_32 = _mm_cvttps_epi32(_mm_add_ps(_mm_set1_ps(0.5f), fColors)), |
fix8_16 = _mm_packus_epi16(fix8_32, fix8_32), |
fix8 = _mm_packus_epi16(fix8_16, fix8_16); |
SkPMColor c = _mm_cvtsi128_si32(fix8); |
@@ -51,10 +53,11 @@ inline void SkPMFloat::To4PMColors(SkPMColor colors[4], const SkPMFloat floats[4 |
inline void SkPMFloat::ClampTo4PMColors(SkPMColor colors[4], const SkPMFloat floats[4]) { |
// Same as _SSE2.h's. We use 3 _mm_packus_epi16() where the naive loop uses 8. |
- __m128i c0 = _mm_cvtps_epi32(floats[0].fColors), // _mm_cvtps_epi32 rounds for us! |
- c1 = _mm_cvtps_epi32(floats[1].fColors), |
- c2 = _mm_cvtps_epi32(floats[2].fColors), |
- c3 = _mm_cvtps_epi32(floats[3].fColors); |
+ // We don't use _mm_cvtps_epi32, because we want precise control over how 0.5 rounds (up). |
+ __m128i c0 = _mm_cvttps_epi32(_mm_add_ps(_mm_set1_ps(0.5f), floats[0].fColors)), |
+ c1 = _mm_cvttps_epi32(_mm_add_ps(_mm_set1_ps(0.5f), floats[1].fColors)), |
+ c2 = _mm_cvttps_epi32(_mm_add_ps(_mm_set1_ps(0.5f), floats[2].fColors)), |
+ c3 = _mm_cvttps_epi32(_mm_add_ps(_mm_set1_ps(0.5f), floats[3].fColors)); |
__m128i c3210 = _mm_packus_epi16(_mm_packus_epi16(c0, c1), |
_mm_packus_epi16(c2, c3)); |
_mm_storeu_si128((__m128i*)colors, c3210); |