aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/core/SkNx.h87
-rw-r--r--src/core/SkRect.cpp2
-rw-r--r--src/opts/SkNx_neon.h88
-rw-r--r--src/opts/SkNx_sse.h60
4 files changed, 115 insertions, 122 deletions
diff --git a/src/core/SkNx.h b/src/core/SkNx.h
index 23e78f3f22..c35d8fe5d3 100644
--- a/src/core/SkNx.h
+++ b/src/core/SkNx.h
@@ -17,29 +17,30 @@
#include <math.h>
#define REQUIRE(x) static_assert(x, #x)
-// The default implementations of SkNi<N,T> and SkNf<N,T> just fall back on a pair of size N/2.
-template <int N, typename T>
-class SkNi {
+// The default implementations just fall back on a pair of size N/2.
+
+// SkNb is a _very_ minimal class representing a vector of bools returned by comparison operators.
+// We pass along the byte size of the compared types (Bytes) to help platform specializations.
+template <int N, int Bytes>
+class SkNb {
public:
- // For now SkNi is a _very_ minimal sketch just to support comparison operators on SkNf.
- SkNi() {}
- SkNi(const SkNi<N/2, T>& lo, const SkNi<N/2, T>& hi) : fLo(lo), fHi(hi) {}
+ SkNb() {}
+ SkNb(const SkNb<N/2, Bytes>& lo, const SkNb<N/2, Bytes>& hi) : fLo(lo), fHi(hi) {}
+
bool allTrue() const { return fLo.allTrue() && fHi.allTrue(); }
bool anyTrue() const { return fLo.anyTrue() || fHi.anyTrue(); }
private:
REQUIRE(0 == (N & (N-1)));
- SkNi<N/2, T> fLo, fHi;
+ SkNb<N/2, Bytes> fLo, fHi;
};
template <int N, typename T>
class SkNf {
- static SkNi<N,int32_t> ToNi(float);
- static SkNi<N,int64_t> ToNi(double);
- typedef decltype(ToNi(T())) Ni;
+ typedef SkNb<N, sizeof(T)> Nb;
public:
SkNf() {}
- explicit SkNf(T val) : fLo(val), fHi(val) {}
+ explicit SkNf(T val) : fLo(val), fHi(val) {}
static SkNf Load(const T vals[N]) {
return SkNf(SkNf<N/2,T>::Load(vals), SkNf<N/2,T>::Load(vals+N/2));
}
@@ -58,12 +59,12 @@ public:
SkNf operator * (const SkNf& o) const { return SkNf(fLo * o.fLo, fHi * o.fHi); }
SkNf operator / (const SkNf& o) const { return SkNf(fLo / o.fLo, fHi / o.fHi); }
- Ni operator == (const SkNf& o) const { return Ni(fLo == o.fLo, fHi == o.fHi); }
- Ni operator != (const SkNf& o) const { return Ni(fLo != o.fLo, fHi != o.fHi); }
- Ni operator < (const SkNf& o) const { return Ni(fLo < o.fLo, fHi < o.fHi); }
- Ni operator > (const SkNf& o) const { return Ni(fLo > o.fLo, fHi > o.fHi); }
- Ni operator <= (const SkNf& o) const { return Ni(fLo <= o.fLo, fHi <= o.fHi); }
- Ni operator >= (const SkNf& o) const { return Ni(fLo >= o.fLo, fHi >= o.fHi); }
+ Nb operator == (const SkNf& o) const { return Nb(fLo == o.fLo, fHi == o.fHi); }
+ Nb operator != (const SkNf& o) const { return Nb(fLo != o.fLo, fHi != o.fHi); }
+ Nb operator < (const SkNf& o) const { return Nb(fLo < o.fLo, fHi < o.fHi); }
+ Nb operator > (const SkNf& o) const { return Nb(fLo > o.fLo, fHi > o.fHi); }
+ Nb operator <= (const SkNf& o) const { return Nb(fLo <= o.fLo, fHi <= o.fHi); }
+ Nb operator >= (const SkNf& o) const { return Nb(fLo >= o.fLo, fHi >= o.fHi); }
static SkNf Min(const SkNf& l, const SkNf& r) {
return SkNf(SkNf<N/2,T>::Min(l.fLo, r.fLo), SkNf<N/2,T>::Min(l.fHi, r.fHi));
@@ -91,27 +92,25 @@ private:
};
-// Bottom out the default implementation with scalars when nothing's been specialized.
-template <typename T>
-class SkNi<1,T> {
-public:
- SkNi() {}
- explicit SkNi(T val) : fVal(val) {}
- bool allTrue() const { return (bool)fVal; }
- bool anyTrue() const { return (bool)fVal; }
+// Bottom out the default implementations with scalars when nothing's been specialized.
+template <int Bytes>
+class SkNb<1, Bytes> {
+public:
+ SkNb() {}
+ explicit SkNb(bool val) : fVal(val) {}
+ bool allTrue() const { return fVal; }
+ bool anyTrue() const { return fVal; }
private:
- T fVal;
+ bool fVal;
};
template <typename T>
class SkNf<1,T> {
- static SkNi<1,int32_t> ToNi(float);
- static SkNi<1,int64_t> ToNi(double);
- typedef decltype(ToNi(T())) Ni;
+ typedef SkNb<1, sizeof(T)> Nb;
public:
SkNf() {}
- explicit SkNf(T val) : fVal(val) {}
+ explicit SkNf(T val) : fVal(val) {}
static SkNf Load(const T vals[1]) { return SkNf(vals[0]); }
void store(T vals[1]) const { vals[0] = fVal; }
@@ -121,17 +120,17 @@ public:
SkNf operator * (const SkNf& o) const { return SkNf(fVal * o.fVal); }
SkNf operator / (const SkNf& o) const { return SkNf(fVal / o.fVal); }
- Ni operator == (const SkNf& o) const { return Ni(fVal == o.fVal); }
- Ni operator != (const SkNf& o) const { return Ni(fVal != o.fVal); }
- Ni operator < (const SkNf& o) const { return Ni(fVal < o.fVal); }
- Ni operator > (const SkNf& o) const { return Ni(fVal > o.fVal); }
- Ni operator <= (const SkNf& o) const { return Ni(fVal <= o.fVal); }
- Ni operator >= (const SkNf& o) const { return Ni(fVal >= o.fVal); }
+ Nb operator == (const SkNf& o) const { return Nb(fVal == o.fVal); }
+ Nb operator != (const SkNf& o) const { return Nb(fVal != o.fVal); }
+ Nb operator < (const SkNf& o) const { return Nb(fVal < o.fVal); }
+ Nb operator > (const SkNf& o) const { return Nb(fVal > o.fVal); }
+ Nb operator <= (const SkNf& o) const { return Nb(fVal <= o.fVal); }
+ Nb operator >= (const SkNf& o) const { return Nb(fVal >= o.fVal); }
static SkNf Min(const SkNf& l, const SkNf& r) { return SkNf(SkTMin(l.fVal, r.fVal)); }
static SkNf Max(const SkNf& l, const SkNf& r) { return SkNf(SkTMax(l.fVal, r.fVal)); }
- SkNf sqrt() const { return SkNf(Sqrt(fVal)); }
+ SkNf sqrt() const { return SkNf(Sqrt(fVal)); }
SkNf rsqrt() const { return SkNf((T)1 / Sqrt(fVal)); }
SkNf invert() const { return SkNf((T)1 / fVal); }
@@ -152,13 +151,13 @@ private:
};
-// Generic syntax sugar that should work equally well for all SkNi and SkNf implementations.
-template <typename SkNx> SkNx operator - (const SkNx& l) { return SkNx(0) - l; }
+// Generic syntax sugar that should work equally well for all implementations.
+template <typename T> T operator - (const T& l) { return T(0) - l; }
-template <typename SkNx> SkNx& operator += (SkNx& l, const SkNx& r) { return (l = l + r); }
-template <typename SkNx> SkNx& operator -= (SkNx& l, const SkNx& r) { return (l = l - r); }
-template <typename SkNx> SkNx& operator *= (SkNx& l, const SkNx& r) { return (l = l * r); }
-template <typename SkNx> SkNx& operator /= (SkNx& l, const SkNx& r) { return (l = l / r); }
+template <typename L, typename R> L& operator += (L& l, const R& r) { return (l = l + r); }
+template <typename L, typename R> L& operator -= (L& l, const R& r) { return (l = l - r); }
+template <typename L, typename R> L& operator *= (L& l, const R& r) { return (l = l * r); }
+template <typename L, typename R> L& operator /= (L& l, const R& r) { return (l = l / r); }
// Include platform specific specializations if available.
@@ -180,6 +179,4 @@ typedef SkNf<4, float> Sk4f;
typedef SkNf<4, double> Sk4d;
typedef SkNf<4, SkScalar> Sk4s;
-typedef SkNi<4, int32_t> Sk4i;
-
#endif//SkNx_DEFINED
diff --git a/src/core/SkRect.cpp b/src/core/SkRect.cpp
index 14d862430a..a28af27cb1 100644
--- a/src/core/SkRect.cpp
+++ b/src/core/SkRect.cpp
@@ -48,7 +48,7 @@ void SkRect::toQuad(SkPoint quad[4]) const {
#include "SkNx.h"
static inline bool is_finite(const Sk4s& value) {
- Sk4i finite = value * Sk4s(0) == Sk4s(0);
+ auto finite = value * Sk4s(0) == Sk4s(0);
return finite.allTrue();
}
diff --git a/src/opts/SkNx_neon.h b/src/opts/SkNx_neon.h
index 451482936f..04db8781bc 100644
--- a/src/opts/SkNx_neon.h
+++ b/src/opts/SkNx_neon.h
@@ -11,34 +11,34 @@
#include <arm_neon.h>
template <>
-class SkNi<2, int32_t> {
+class SkNb<2, 4> {
public:
- SkNi(int32x2_t vec) : fVec(vec) {}
+ SkNb(uint32x2_t vec) : fVec(vec) {}
- SkNi() {}
- bool allTrue() const { return vget_lane_s32(fVec, 0) && vget_lane_s32(fVec, 1); }
- bool anyTrue() const { return vget_lane_s32(fVec, 0) || vget_lane_s32(fVec, 1); }
+ SkNb() {}
+ bool allTrue() const { return vget_lane_u32(fVec, 0) && vget_lane_u32(fVec, 1); }
+ bool anyTrue() const { return vget_lane_u32(fVec, 0) || vget_lane_u32(fVec, 1); }
private:
- int32x2_t fVec;
+ uint32x2_t fVec;
};
template <>
-class SkNi<4, int32_t> {
+class SkNb<4, 4> {
public:
- SkNi(int32x4_t vec) : fVec(vec) {}
+ SkNb(uint32x4_t vec) : fVec(vec) {}
- SkNi() {}
- bool allTrue() const { return vgetq_lane_s32(fVec, 0) && vgetq_lane_s32(fVec, 1)
- && vgetq_lane_s32(fVec, 2) && vgetq_lane_s32(fVec, 3); }
- bool anyTrue() const { return vgetq_lane_s32(fVec, 0) || vgetq_lane_s32(fVec, 1)
- || vgetq_lane_s32(fVec, 2) || vgetq_lane_s32(fVec, 3); }
+ SkNb() {}
+ bool allTrue() const { return vgetq_lane_u32(fVec, 0) && vgetq_lane_u32(fVec, 1)
+ && vgetq_lane_u32(fVec, 2) && vgetq_lane_u32(fVec, 3); }
+ bool anyTrue() const { return vgetq_lane_u32(fVec, 0) || vgetq_lane_u32(fVec, 1)
+ || vgetq_lane_u32(fVec, 2) || vgetq_lane_u32(fVec, 3); }
private:
- int32x4_t fVec;
+ uint32x4_t fVec;
};
template <>
class SkNf<2, float> {
- typedef SkNi<2, int32_t> Ni;
+ typedef SkNb<2, 4> Nb;
public:
SkNf(float32x2_t vec) : fVec(vec) {}
@@ -71,14 +71,12 @@ public:
#endif
}
- Ni operator == (const SkNf& o) const { return vreinterpret_s32_u32(vceq_f32(fVec, o.fVec)); }
- Ni operator < (const SkNf& o) const { return vreinterpret_s32_u32(vclt_f32(fVec, o.fVec)); }
- Ni operator > (const SkNf& o) const { return vreinterpret_s32_u32(vcgt_f32(fVec, o.fVec)); }
- Ni operator <= (const SkNf& o) const { return vreinterpret_s32_u32(vcle_f32(fVec, o.fVec)); }
- Ni operator >= (const SkNf& o) const { return vreinterpret_s32_u32(vcge_f32(fVec, o.fVec)); }
- Ni operator != (const SkNf& o) const {
- return vreinterpret_s32_u32(vmvn_u32(vceq_f32(fVec, o.fVec)));
- }
+ Nb operator == (const SkNf& o) const { return vceq_f32(fVec, o.fVec); }
+ Nb operator < (const SkNf& o) const { return vclt_f32(fVec, o.fVec); }
+ Nb operator > (const SkNf& o) const { return vcgt_f32(fVec, o.fVec); }
+ Nb operator <= (const SkNf& o) const { return vcle_f32(fVec, o.fVec); }
+ Nb operator >= (const SkNf& o) const { return vcge_f32(fVec, o.fVec); }
+ Nb operator != (const SkNf& o) const { return vmvn_u32(vceq_f32(fVec, o.fVec)); }
static SkNf Min(const SkNf& l, const SkNf& r) { return vmin_f32(l.fVec, r.fVec); }
static SkNf Max(const SkNf& l, const SkNf& r) { return vmax_f32(l.fVec, r.fVec); }
@@ -111,20 +109,20 @@ private:
#if defined(SK_CPU_ARM64)
template <>
-class SkNi<2, int64_t> {
+class SkNb<2, 8> {
public:
- SkNi(int64x2_t vec) : fVec(vec) {}
+ SkNb(uint64x2_t vec) : fVec(vec) {}
- SkNi() {}
- bool allTrue() const { return vgetq_lane_s64(fVec, 0) && vgetq_lane_s64(fVec, 1); }
- bool anyTrue() const { return vgetq_lane_s64(fVec, 0) || vgetq_lane_s64(fVec, 1); }
+ SkNb() {}
+ bool allTrue() const { return vgetq_lane_u64(fVec, 0) && vgetq_lane_u64(fVec, 1); }
+ bool anyTrue() const { return vgetq_lane_u64(fVec, 0) || vgetq_lane_u64(fVec, 1); }
private:
- int64x2_t fVec;
+ uint64x2_t fVec;
};
template <>
class SkNf<2, double> {
- typedef SkNi<2, int64_t> Ni;
+ typedef SkNb<2, 8> Nb;
public:
SkNf(float64x2_t vec) : fVec(vec) {}
@@ -140,13 +138,13 @@ public:
SkNf operator * (const SkNf& o) const { return vmulq_f64(fVec, o.fVec); }
SkNf operator / (const SkNf& o) const { return vdivq_f64(fVec, o.fVec); }
- Ni operator == (const SkNf& o) const { return vreinterpretq_s64_u64(vceqq_f64(fVec, o.fVec)); }
- Ni operator < (const SkNf& o) const { return vreinterpretq_s64_u64(vcltq_f64(fVec, o.fVec)); }
- Ni operator > (const SkNf& o) const { return vreinterpretq_s64_u64(vcgtq_f64(fVec, o.fVec)); }
- Ni operator <= (const SkNf& o) const { return vreinterpretq_s64_u64(vcleq_f64(fVec, o.fVec)); }
- Ni operator >= (const SkNf& o) const { return vreinterpretq_s64_u64(vcgeq_f64(fVec, o.fVec)); }
- Ni operator != (const SkNf& o) const {
- return vreinterpretq_s64_u32(vmvnq_u32(vreinterpretq_u32_u64(vceqq_f64(fVec, o.fVec))));
+ Nb operator == (const SkNf& o) const { return vceqq_f64(fVec, o.fVec); }
+ Nb operator < (const SkNf& o) const { return vcltq_f64(fVec, o.fVec); }
+ Nb operator > (const SkNf& o) const { return vcgtq_f64(fVec, o.fVec); }
+ Nb operator <= (const SkNf& o) const { return vcleq_f64(fVec, o.fVec); }
+ Nb operator >= (const SkNf& o) const { return vcgeq_f64(fVec, o.fVec); }
+ Nb operator != (const SkNf& o) const {
+ return vreinterpretq_u64_u32(vmvnq_u32(vreinterpretq_u32_u64(vceqq_f64(fVec, o.fVec))));
}
static SkNf Min(const SkNf& l, const SkNf& r) { return vminq_f64(l.fVec, r.fVec); }
@@ -184,7 +182,7 @@ private:
template <>
class SkNf<4, float> {
- typedef SkNi<4, int32_t> Ni;
+ typedef SkNb<4, 4> Nb;
public:
SkNf(float32x4_t vec) : fVec(vec) {}
@@ -217,14 +215,12 @@ public:
#endif
}
- Ni operator == (const SkNf& o) const { return vreinterpretq_s32_u32(vceqq_f32(fVec, o.fVec)); }
- Ni operator < (const SkNf& o) const { return vreinterpretq_s32_u32(vcltq_f32(fVec, o.fVec)); }
- Ni operator > (const SkNf& o) const { return vreinterpretq_s32_u32(vcgtq_f32(fVec, o.fVec)); }
- Ni operator <= (const SkNf& o) const { return vreinterpretq_s32_u32(vcleq_f32(fVec, o.fVec)); }
- Ni operator >= (const SkNf& o) const { return vreinterpretq_s32_u32(vcgeq_f32(fVec, o.fVec)); }
- Ni operator != (const SkNf& o) const {
- return vreinterpretq_s32_u32(vmvnq_u32(vceqq_f32(fVec, o.fVec)));
- }
+ Nb operator == (const SkNf& o) const { return vceqq_f32(fVec, o.fVec); }
+ Nb operator < (const SkNf& o) const { return vcltq_f32(fVec, o.fVec); }
+ Nb operator > (const SkNf& o) const { return vcgtq_f32(fVec, o.fVec); }
+ Nb operator <= (const SkNf& o) const { return vcleq_f32(fVec, o.fVec); }
+ Nb operator >= (const SkNf& o) const { return vcgeq_f32(fVec, o.fVec); }
+ Nb operator != (const SkNf& o) const { return vmvnq_u32(vceqq_f32(fVec, o.fVec)); }
static SkNf Min(const SkNf& l, const SkNf& r) { return vminq_f32(l.fVec, r.fVec); }
static SkNf Max(const SkNf& l, const SkNf& r) { return vmaxq_f32(l.fVec, r.fVec); }
diff --git a/src/opts/SkNx_sse.h b/src/opts/SkNx_sse.h
index c1ae1f0469..a63cd840c0 100644
--- a/src/opts/SkNx_sse.h
+++ b/src/opts/SkNx_sse.h
@@ -12,11 +12,11 @@
#include <immintrin.h>
template <>
-class SkNi<2, int32_t> {
+class SkNb<2, 4> {
public:
- SkNi(const __m128i& vec) : fVec(vec) {}
+ SkNb(const __m128i& vec) : fVec(vec) {}
- SkNi() {}
+ SkNb() {}
bool allTrue() const { return 0xff == (_mm_movemask_epi8(fVec) & 0xff); }
bool anyTrue() const { return 0x00 != (_mm_movemask_epi8(fVec) & 0xff); }
@@ -25,11 +25,11 @@ private:
};
template <>
-class SkNi<4, int32_t> {
+class SkNb<4, 4> {
public:
- SkNi(const __m128i& vec) : fVec(vec) {}
+ SkNb(const __m128i& vec) : fVec(vec) {}
- SkNi() {}
+ SkNb() {}
bool allTrue() const { return 0xffff == _mm_movemask_epi8(fVec); }
bool anyTrue() const { return 0x0000 != _mm_movemask_epi8(fVec); }
@@ -38,11 +38,11 @@ private:
};
template <>
-class SkNi<2, int64_t> {
+class SkNb<2, 8> {
public:
- SkNi(const __m128i& vec) : fVec(vec) {}
+ SkNb(const __m128i& vec) : fVec(vec) {}
- SkNi() {}
+ SkNb() {}
bool allTrue() const { return 0xffff == _mm_movemask_epi8(fVec); }
bool anyTrue() const { return 0x0000 != _mm_movemask_epi8(fVec); }
@@ -53,7 +53,7 @@ private:
template <>
class SkNf<2, float> {
- typedef SkNi<2, int32_t> Ni;
+ typedef SkNb<2, 4> Nb;
public:
SkNf(const __m128& vec) : fVec(vec) {}
@@ -71,12 +71,12 @@ public:
SkNf operator * (const SkNf& o) const { return _mm_mul_ps(fVec, o.fVec); }
SkNf operator / (const SkNf& o) const { return _mm_div_ps(fVec, o.fVec); }
- Ni operator == (const SkNf& o) const { return _mm_castps_si128(_mm_cmpeq_ps (fVec, o.fVec)); }
- Ni operator != (const SkNf& o) const { return _mm_castps_si128(_mm_cmpneq_ps(fVec, o.fVec)); }
- Ni operator < (const SkNf& o) const { return _mm_castps_si128(_mm_cmplt_ps (fVec, o.fVec)); }
- Ni operator > (const SkNf& o) const { return _mm_castps_si128(_mm_cmpgt_ps (fVec, o.fVec)); }
- Ni operator <= (const SkNf& o) const { return _mm_castps_si128(_mm_cmple_ps (fVec, o.fVec)); }
- Ni operator >= (const SkNf& o) const { return _mm_castps_si128(_mm_cmpge_ps (fVec, o.fVec)); }
+ Nb operator == (const SkNf& o) const { return _mm_castps_si128(_mm_cmpeq_ps (fVec, o.fVec)); }
+ Nb operator != (const SkNf& o) const { return _mm_castps_si128(_mm_cmpneq_ps(fVec, o.fVec)); }
+ Nb operator < (const SkNf& o) const { return _mm_castps_si128(_mm_cmplt_ps (fVec, o.fVec)); }
+ Nb operator > (const SkNf& o) const { return _mm_castps_si128(_mm_cmpgt_ps (fVec, o.fVec)); }
+ Nb operator <= (const SkNf& o) const { return _mm_castps_si128(_mm_cmple_ps (fVec, o.fVec)); }
+ Nb operator >= (const SkNf& o) const { return _mm_castps_si128(_mm_cmpge_ps (fVec, o.fVec)); }
static SkNf Min(const SkNf& l, const SkNf& r) { return _mm_min_ps(l.fVec, r.fVec); }
static SkNf Max(const SkNf& l, const SkNf& r) { return _mm_max_ps(l.fVec, r.fVec); }
@@ -99,7 +99,7 @@ private:
template <>
class SkNf<2, double> {
- typedef SkNi<2, int64_t> Ni;
+ typedef SkNb<2, 8> Nb;
public:
SkNf(const __m128d& vec) : fVec(vec) {}
@@ -115,12 +115,12 @@ public:
SkNf operator * (const SkNf& o) const { return _mm_mul_pd(fVec, o.fVec); }
SkNf operator / (const SkNf& o) const { return _mm_div_pd(fVec, o.fVec); }
- Ni operator == (const SkNf& o) const { return _mm_castpd_si128(_mm_cmpeq_pd (fVec, o.fVec)); }
- Ni operator != (const SkNf& o) const { return _mm_castpd_si128(_mm_cmpneq_pd(fVec, o.fVec)); }
- Ni operator < (const SkNf& o) const { return _mm_castpd_si128(_mm_cmplt_pd (fVec, o.fVec)); }
- Ni operator > (const SkNf& o) const { return _mm_castpd_si128(_mm_cmpgt_pd (fVec, o.fVec)); }
- Ni operator <= (const SkNf& o) const { return _mm_castpd_si128(_mm_cmple_pd (fVec, o.fVec)); }
- Ni operator >= (const SkNf& o) const { return _mm_castpd_si128(_mm_cmpge_pd (fVec, o.fVec)); }
+ Nb operator == (const SkNf& o) const { return _mm_castpd_si128(_mm_cmpeq_pd (fVec, o.fVec)); }
+ Nb operator != (const SkNf& o) const { return _mm_castpd_si128(_mm_cmpneq_pd(fVec, o.fVec)); }
+ Nb operator < (const SkNf& o) const { return _mm_castpd_si128(_mm_cmplt_pd (fVec, o.fVec)); }
+ Nb operator > (const SkNf& o) const { return _mm_castpd_si128(_mm_cmpgt_pd (fVec, o.fVec)); }
+ Nb operator <= (const SkNf& o) const { return _mm_castpd_si128(_mm_cmple_pd (fVec, o.fVec)); }
+ Nb operator >= (const SkNf& o) const { return _mm_castpd_si128(_mm_cmpge_pd (fVec, o.fVec)); }
static SkNf Min(const SkNf& l, const SkNf& r) { return _mm_min_pd(l.fVec, r.fVec); }
static SkNf Max(const SkNf& l, const SkNf& r) { return _mm_max_pd(l.fVec, r.fVec); }
@@ -143,7 +143,7 @@ private:
template <>
class SkNf<4, float> {
- typedef SkNi<4, int32_t> Ni;
+ typedef SkNb<4, 4> Nb;
public:
SkNf(const __m128& vec) : fVec(vec) {}
@@ -159,12 +159,12 @@ public:
SkNf operator * (const SkNf& o) const { return _mm_mul_ps(fVec, o.fVec); }
SkNf operator / (const SkNf& o) const { return _mm_div_ps(fVec, o.fVec); }
- Ni operator == (const SkNf& o) const { return _mm_castps_si128(_mm_cmpeq_ps (fVec, o.fVec)); }
- Ni operator != (const SkNf& o) const { return _mm_castps_si128(_mm_cmpneq_ps(fVec, o.fVec)); }
- Ni operator < (const SkNf& o) const { return _mm_castps_si128(_mm_cmplt_ps (fVec, o.fVec)); }
- Ni operator > (const SkNf& o) const { return _mm_castps_si128(_mm_cmpgt_ps (fVec, o.fVec)); }
- Ni operator <= (const SkNf& o) const { return _mm_castps_si128(_mm_cmple_ps (fVec, o.fVec)); }
- Ni operator >= (const SkNf& o) const { return _mm_castps_si128(_mm_cmpge_ps (fVec, o.fVec)); }
+ Nb operator == (const SkNf& o) const { return _mm_castps_si128(_mm_cmpeq_ps (fVec, o.fVec)); }
+ Nb operator != (const SkNf& o) const { return _mm_castps_si128(_mm_cmpneq_ps(fVec, o.fVec)); }
+ Nb operator < (const SkNf& o) const { return _mm_castps_si128(_mm_cmplt_ps (fVec, o.fVec)); }
+ Nb operator > (const SkNf& o) const { return _mm_castps_si128(_mm_cmpgt_ps (fVec, o.fVec)); }
+ Nb operator <= (const SkNf& o) const { return _mm_castps_si128(_mm_cmple_ps (fVec, o.fVec)); }
+ Nb operator >= (const SkNf& o) const { return _mm_castps_si128(_mm_cmpge_ps (fVec, o.fVec)); }
static SkNf Min(const SkNf& l, const SkNf& r) { return _mm_min_ps(l.fVec, r.fVec); }
static SkNf Max(const SkNf& l, const SkNf& r) { return _mm_max_ps(l.fVec, r.fVec); }
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-01 06:14:36 +0000