diff options
Diffstat (limited to 'src/core/transforms/vector3d_sse_p.h')
-rw-r--r-- | src/core/transforms/vector3d_sse_p.h | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/src/core/transforms/vector3d_sse_p.h b/src/core/transforms/vector3d_sse_p.h index 7dc5ea17f..2812b5d1a 100644 --- a/src/core/transforms/vector3d_sse_p.h +++ b/src/core/transforms/vector3d_sse_p.h @@ -22,14 +22,13 @@ #include <QDebug> #include <math.h> -#ifdef QT_COMPILER_SUPPORTS_SSE2 +#ifdef __SSE2__ QT_BEGIN_NAMESPACE namespace Qt3DCore { class Matrix4x4_SSE; -class Matrix4x4_AVX2; class Vector4D_SSE; class Vector3D_SSE @@ -142,13 +141,8 @@ public: return ((_mm_movemask_ps(_mm_cmpeq_ps(m_xyzw, _mm_set_ps1(0.0f))) & 0x7) == 0x7); } -#if defined(__AVX2__) && defined(QT_COMPILER_SUPPORTS_AVX2) - Q_3DCORE_PRIVATE_EXPORT Vector3D_SSE unproject(const Matrix4x4_AVX2 &modelView, const Matrix4x4_AVX2 &projection, const QRect &viewport) const; - Q_3DCORE_PRIVATE_EXPORT Vector3D_SSE project(const Matrix4x4_AVX2 &modelView, const Matrix4x4_AVX2 &projection, const QRect &viewport) const; -#else Q_3DCORE_PRIVATE_EXPORT Vector3D_SSE unproject(const Matrix4x4_SSE &modelView, const Matrix4x4_SSE &projection, const QRect &viewport) const; Q_3DCORE_PRIVATE_EXPORT Vector3D_SSE project(const Matrix4x4_SSE &modelView, const Matrix4x4_SSE &projection, const QRect &viewport) const; -#endif Q_ALWAYS_INLINE float x() const { return _mm_cvtss_f32(m_xyzw); } @@ -311,13 +305,6 @@ public: } friend class Vector4D_SSE; - -#if defined(__AVX2__) && defined(QT_COMPILER_SUPPORTS_AVX2) - friend class Matrix4x4_AVX2; - friend Vector3D_SSE operator*(const Vector3D_SSE &vector, const Matrix4x4_AVX2 &matrix); - friend Vector3D_SSE operator*(const Matrix4x4_AVX2 &matrix, const Vector3D_SSE &vector); -#endif - friend class Matrix4x4_SSE; friend Vector3D_SSE operator*(const Vector3D_SSE &vector, const Matrix4x4_SSE &matrix); friend Vector3D_SSE operator*(const Matrix4x4_SSE &matrix, const Vector3D_SSE &vector); @@ -360,6 +347,6 @@ QT_END_NAMESPACE Q_DECLARE_METATYPE(Qt3DCore::Vector3D_SSE) -#endif // QT_COMPILER_SUPPORTS_SSE2 +#endif // __SSE2__ #endif // QT3DCORE_VECTOR3D_SSE_P_H |