diff --git a/GPU/Math3D.h b/GPU/Math3D.h index a87cce8318..d6514aa1b0 100644 --- a/GPU/Math3D.h +++ b/GPU/Math3D.h @@ -57,22 +57,10 @@ inline static T VecClamp(const T &v, const T &low, const T &high) } template -class Vec2 -{ +class Vec2 { public: - union - { - struct - { - T x,y; - }; -#if defined(_M_SSE) - __m128i ivec; - __m128 vec; -#elif PPSSPP_ARCH(ARM64_NEON) - int32x4_t ivec; - float32x4_t vec; -#endif + struct { + T x,y; }; T* AsArray() { return &x; } @@ -81,15 +69,6 @@ public: Vec2() {} Vec2(const T a[2]) : x(a[0]), y(a[1]) {} Vec2(const T& _x, const T& _y) : x(_x), y(_y) {} -#if defined(_M_SSE) - Vec2(const __m128 &_vec) : vec(_vec) {} - Vec2(const __m128i &_ivec) : ivec(_ivec) {} -#elif PPSSPP_ARCH(ARM64_NEON) - Vec2(const float32x4_t &_vec) : vec(_vec) {} -#if !defined(_MSC_VER) - Vec2(const int32x4_t &_ivec) : ivec(_ivec) {} -#endif -#endif template Vec2 Cast() const diff --git a/GPU/Software/Rasterizer.cpp b/GPU/Software/Rasterizer.cpp index a47ed9b0da..8f25791ba4 100644 --- a/GPU/Software/Rasterizer.cpp +++ b/GPU/Software/Rasterizer.cpp @@ -78,14 +78,6 @@ static inline Vec3 Interpolate(const Vec3 &c0, const Vec3 &c1, co #endif } -static inline Vec2 Interpolate(const Vec2 &c0, const Vec2 &c1, const Vec2 &c2, int w0, int w1, int w2, float wsum) { -#if defined(_M_SSE) && !PPSSPP_ARCH(X86) - return Vec2(Interpolate(c0.vec, c1.vec, c2.vec, w0, w1, w2, wsum)); -#else - return (c0 * w0 + c1 * w1 + c2 * w2) * wsum; -#endif -} - static inline Vec4 Interpolate(const float &c0, const float &c1, const float &c2, const Vec4 &w0, const Vec4 &w1, const Vec4 &w2, const Vec4 &wsum_recip) { #if defined(_M_SSE) && !PPSSPP_ARCH(X86) __m128 v = _mm_mul_ps(w0.vec, _mm_set1_ps(c0));