| OLD | NEW |
| 1 #ifndef Sk4x_DEFINED | 1 #ifndef Sk4x_DEFINED |
| 2 #define Sk4x_DEFINED | 2 #define Sk4x_DEFINED |
| 3 | 3 |
| 4 #include "SkTypes.h" | 4 #include "SkTypes.h" |
| 5 #include "SkNx.h" | 5 #include "SkNx.h" |
| 6 | 6 |
| 7 #define SK4X_PREAMBLE 1 | 7 #define SK4X_PREAMBLE 1 |
| 8 #if SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE2 && !defined(SKNX_NO_SIMD) | 8 #if SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE2 && !defined(SKNX_NO_SIMD) |
| 9 #include "../opts/Sk4x_sse.h" | 9 #include "../opts/Sk4x_sse.h" |
| 10 #elif defined(SK_ARM_HAS_NEON) && !defined(SKNX_NO_SIMD) | 10 #elif defined(SK_ARM_HAS_NEON) && !defined(SKNX_NO_SIMD) |
| (...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 86 Sk4i operator !=(const Sk4x& o) const { return this->notEqual(o); } | 86 Sk4i operator !=(const Sk4x& o) const { return this->notEqual(o); } |
| 87 Sk4i operator <(const Sk4x& o) const { return this->lessThan(o); } | 87 Sk4i operator <(const Sk4x& o) const { return this->lessThan(o); } |
| 88 Sk4i operator >(const Sk4x& o) const { return this->greaterThan(o); } | 88 Sk4i operator >(const Sk4x& o) const { return this->greaterThan(o); } |
| 89 Sk4i operator <=(const Sk4x& o) const { return this->lessThanEqual(o); } | 89 Sk4i operator <=(const Sk4x& o) const { return this->lessThanEqual(o); } |
| 90 Sk4i operator >=(const Sk4x& o) const { return this->greaterThanEqual(o); } | 90 Sk4i operator >=(const Sk4x& o) const { return this->greaterThanEqual(o); } |
| 91 | 91 |
| 92 static Sk4x Min(const Sk4x& a, const Sk4x& b); | 92 static Sk4x Min(const Sk4x& a, const Sk4x& b); |
| 93 static Sk4x Max(const Sk4x& a, const Sk4x& b); | 93 static Sk4x Max(const Sk4x& a, const Sk4x& b); |
| 94 | 94 |
| 95 // Swizzles, where this == abcd. | 95 // Swizzles, where this == abcd. |
| 96 Sk4x aacc() const; |
| 97 Sk4x bbdd() const; |
| 96 Sk4x badc() const; | 98 Sk4x badc() const; |
| 97 | 99 |
| 98 private: | 100 private: |
| 99 // It's handy to have Sk4f and Sk4i be mutual friends. | 101 // It's handy to have Sk4f and Sk4i be mutual friends. |
| 100 template <typename S> friend class Sk4x; | 102 template <typename S> friend class Sk4x; |
| 101 | 103 |
| 102 #define SK4X_PRIVATE 1 | 104 #define SK4X_PRIVATE 1 |
| 103 #if SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE2 && !defined(SKNX_NO_SIMD) | 105 #if SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE2 && !defined(SKNX_NO_SIMD) |
| 104 #include "../opts/Sk4x_sse.h" | 106 #include "../opts/Sk4x_sse.h" |
| 105 #elif defined(SK_ARM_HAS_NEON) && !defined(SKNX_NO_SIMD) | 107 #elif defined(SK_ARM_HAS_NEON) && !defined(SKNX_NO_SIMD) |
| 106 #include "../opts/Sk4x_neon.h" | 108 #include "../opts/Sk4x_neon.h" |
| 107 #else | 109 #else |
| 108 #include "../opts/Sk4x_none.h" | 110 #include "../opts/Sk4x_none.h" |
| 109 #endif | 111 #endif |
| 110 #undef SK4X_PRIVATE | 112 #undef SK4X_PRIVATE |
| 111 }; | 113 }; |
| 112 | 114 |
| 113 #if SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE2 && !defined(SKNX_NO_SIMD) | 115 #if SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE2 && !defined(SKNX_NO_SIMD) |
| 114 #include "../opts/Sk4x_sse.h" | 116 #include "../opts/Sk4x_sse.h" |
| 115 #elif defined(SK_ARM_HAS_NEON) && !defined(SKNX_NO_SIMD) | 117 #elif defined(SK_ARM_HAS_NEON) && !defined(SKNX_NO_SIMD) |
| 116 #include "../opts/Sk4x_neon.h" | 118 #include "../opts/Sk4x_neon.h" |
| 117 #else | 119 #else |
| 118 #include "../opts/Sk4x_none.h" | 120 #include "../opts/Sk4x_none.h" |
| 119 #endif | 121 #endif |
| 120 | 122 |
| 121 #endif//Sk4x_DEFINED | 123 #endif//Sk4x_DEFINED |
| OLD | NEW |