Index: src/opts/SkPMFloat_SSE2.h |
diff --git a/src/opts/SkPMFloat_SSE2.h b/src/opts/SkPMFloat_SSE2.h |
index 7298b4da3c6b67ddd9611b73ef3ef0ab91bc3a92..9c1295b56555e5f6e5b32fd5ff7f16e6066d2843 100644 |
--- a/src/opts/SkPMFloat_SSE2.h |
+++ b/src/opts/SkPMFloat_SSE2.h |
@@ -1,5 +1,7 @@ |
-#include "SkColorPriv.h" |
-#include <emmintrin.h> |
+inline SkPMFloat& SkPMFloat::operator=(const SkPMFloat& that) { |
+ fColors = that.fColors; |
+ return *this; |
+} |
// For SkPMFloat(SkPMColor), we widen our 8 bit components (fix8) to 8-bit components in 16 bits |
// (fix8_16), then widen those to 8-bit-in-32-bits (fix8_32), and finally convert those to floats. |
@@ -13,7 +15,7 @@ inline SkPMFloat::SkPMFloat(SkPMColor c) { |
__m128i fix8 = _mm_set_epi32(0,0,0,c), |
fix8_16 = _mm_unpacklo_epi8 (fix8, _mm_setzero_si128()), |
fix8_32 = _mm_unpacklo_epi16(fix8_16, _mm_setzero_si128()); |
- _mm_store_ps(fColor, _mm_cvtepi32_ps(fix8_32)); |
+ fColors = _mm_cvtepi32_ps(fix8_32); |
SkASSERT(this->isValid()); |
} |
@@ -23,7 +25,7 @@ inline SkPMColor SkPMFloat::get() const { |
} |
inline SkPMColor SkPMFloat::clamped() const { |
- __m128i fix8_32 = _mm_cvtps_epi32(_mm_load_ps(fColor)), // _mm_cvtps_epi32 rounds for us! |
+ __m128i fix8_32 = _mm_cvtps_epi32(fColors), // _mm_cvtps_epi32 rounds for us! |
fix8_16 = _mm_packus_epi16(fix8_32, fix8_32), |
fix8 = _mm_packus_epi16(fix8_16, fix8_16); |
SkPMColor c = _mm_cvtsi128_si32(fix8); |
@@ -45,10 +47,10 @@ inline void SkPMFloat::To4PMColors(SkPMColor colors[4], const SkPMFloat floats[4 |
inline void SkPMFloat::ClampTo4PMColors(SkPMColor colors[4], const SkPMFloat floats[4]) { |
// Same as _SSSE3.h's. We use 3 _mm_packus_epi16() where the naive loop uses 8. |
- __m128i c0 = _mm_cvtps_epi32(_mm_load_ps(floats[0].fColor)), // _mm_cvtps_epi32 rounds for us! |
- c1 = _mm_cvtps_epi32(_mm_load_ps(floats[1].fColor)), |
- c2 = _mm_cvtps_epi32(_mm_load_ps(floats[2].fColor)), |
- c3 = _mm_cvtps_epi32(_mm_load_ps(floats[3].fColor)); |
+ __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); |
__m128i c3210 = _mm_packus_epi16(_mm_packus_epi16(c0, c1), |
_mm_packus_epi16(c2, c3)); |
_mm_storeu_si128((__m128i*)colors, c3210); |