AxioDL
/
zeus
mirror of https://github.com/AxioDL/zeus.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://gitlab.axiodl.com:6431/AxioDL/zeus

This commit is contained in:
Jack Andersen 2017-12-17 13:05:21 -10:00
parent f5f38ac827 50f47d6455
commit 1535b3efcd
6 changed files with 52 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
include/zeus/CColor.hpp
View File

@ -259,16 +259,13 @@ public:
{ {
#if __SSE__ #if __SSE__
TVectorUnion result; TVectorUnion result;
#if __SSE4_1__ || __SSE4_2__ #if __SSE4_1__
if (cpuFeatures().SSE41 || cpuFeatures().SSE42) result.mVec128 = _mm_dp_ps(mVec128, mVec128, 0xF1);
{ return result.v[0];
result.mVec128 = _mm_dp_ps(mVec128, mVec128, 0xF1); #else
return result.v[0];
}
#endif
result.mVec128 = _mm_mul_ps(mVec128, mVec128); result.mVec128 = _mm_mul_ps(mVec128, mVec128);
return result.v[0] + result.v[1] + result.v[2] + result.v[3]; return result.v[0] + result.v[1] + result.v[2] + result.v[3];
#endif
#else #else
return r * r + g * g + b * b + a * a; return r * r + g * g + b * b + a * a;
#endif #endif
@ -295,15 +292,13 @@ public:
{ {
#if __SSE__ #if __SSE__
TVectorUnion result; TVectorUnion result;
#if __SSE4_1__ || __SSE4_2__ #if __SSE4_1__
if (cpuFeatures().SSE41 || cpuFeatures().SSE42) result.mVec128 = _mm_dp_ps(mVec128, rhs.mVec128, 0x71);
{ return result.v[0];
result.mVec128 = _mm_dp_ps(mVec128, rhs.mVec128, 0x71); #else
return result.v[0];
}
#endif
result.mVec128 = _mm_mul_ps(mVec128, rhs.mVec128); result.mVec128 = _mm_mul_ps(mVec128, rhs.mVec128);
return result.v[0] + result.v[1] + result.v[2]; return result.v[0] + result.v[1] + result.v[2];
#endif
#else #else
return (r * rhs.r) + (g * rhs.g) + (b * rhs.b); return (r * rhs.r) + (g * rhs.g) + (b * rhs.b);
#endif #endif

9
include/zeus/CQuaternion.hpp
View File

@ -175,16 +175,13 @@ public:
{ {
#if __SSE__ #if __SSE__
TVectorUnion result; TVectorUnion result;
#if __SSE4_1__ || __SSE4_2__ #if __SSE4_1__
if (cpuFeatures().SSE41 || cpuFeatures().SSE42)
{
result.mVec128 = _mm_dp_ps(mVec128, rhs.mVec128, 0xF1); result.mVec128 = _mm_dp_ps(mVec128, rhs.mVec128, 0xF1);
return result.v[0]; return result.v[0];
} #else
#endif
result.mVec128 = _mm_mul_ps(mVec128, rhs.mVec128); result.mVec128 = _mm_mul_ps(mVec128, rhs.mVec128);
return result.v[0] + result.v[1] + result.v[2] + result.v[3]; return result.v[0] + result.v[1] + result.v[2] + result.v[3];
#endif
#else #else
return (x * rhs.x) + (y * rhs.y) + (z * rhs.z) + (w * rhs.w); return (x * rhs.x) + (y * rhs.y) + (z * rhs.z) + (w * rhs.w);
#endif #endif

22
include/zeus/CVector2f.hpp
View File

@ -280,14 +280,12 @@ public:
#if __SSE__ #if __SSE__
TVectorUnion result; TVectorUnion result;
#if __SSE4_1__ #if __SSE4_1__
if (cpuFeatures().SSE41 || cpuFeatures().SSE42) result.mVec128 = _mm_dp_ps(mVec128, rhs.mVec128, 0x31);
{ return result.v[0];
result.mVec128 = _mm_dp_ps(mVec128, rhs.mVec128, 0x31); #else
return result.v[0];
}
#endif
result.mVec128 = _mm_mul_ps(mVec128, rhs.mVec128); result.mVec128 = _mm_mul_ps(mVec128, rhs.mVec128);
return result.v[0] + result.v[1]; return result.v[0] + result.v[1];
#endif
#else #else
return (x * rhs.x) + (y * rhs.y); return (x * rhs.x) + (y * rhs.y);
#endif #endif
@ -296,15 +294,13 @@ public:
{ {
#if __SSE__ #if __SSE__
TVectorUnion result; TVectorUnion result;
#if __SSE4_1__ || __SSE4_2__ #if __SSE4_1__
if (cpuFeatures().SSE41 || cpuFeatures().SSE42) result.mVec128 = _mm_dp_ps(mVec128, mVec128, 0x31);
{ return result.v[0];
result.mVec128 = _mm_dp_ps(mVec128, mVec128, 0x31); #else
return result.v[0];
}
#endif
result.mVec128 = _mm_mul_ps(mVec128, mVec128); result.mVec128 = _mm_mul_ps(mVec128, mVec128);
return result.v[0] + result.v[1]; return result.v[0] + result.v[1];
#endif
#else #else
return x * x + y * y; return x * x + y * y;
#endif #endif

26
include/zeus/CVector3d.hpp
View File

@ -74,16 +74,14 @@ public:
{ {
#if __SSE__ #if __SSE__
TDblVectorUnion result; TDblVectorUnion result;
#if __SSE4_1__ || __SSE4_2__ #if __SSE4_1__
if (cpuFeatures().SSE41 || cpuFeatures().SSE42) result.mVec128[0] = _mm_dp_pd(mVec128[0], mVec128[0], 0x31);
{ return result.v[0] + (v[2] * v[2]);
result.mVec128[0] = _mm_dp_pd(mVec128[0], mVec128[0], 0x31); #else
return result.v[0] + (v[2] * v[2]);
}
#endif
result.mVec128[0] = _mm_mul_pd(mVec128[0], mVec128[0]); result.mVec128[0] = _mm_mul_pd(mVec128[0], mVec128[0]);
result.mVec128[1] = _mm_mul_pd(mVec128[1], mVec128[1]); result.mVec128[1] = _mm_mul_pd(mVec128[1], mVec128[1]);
return result.v[0] + result.v[1] + result.v[2]; return result.v[0] + result.v[1] + result.v[2];
#endif
#else #else
return x * x + y * y + z * z; return x * x + y * y + z * z;
#endif #endif
@ -97,20 +95,16 @@ public:
double dot(const CVector3d& rhs) const double dot(const CVector3d& rhs) const
{ {
#if __SSE__ #if __SSE__
TDblVectorUnion result; TDblVectorUnion result;
#if __SSE4_1__ || __SSE4_2__ #if __SSE4_1__
if (cpuFeatures().SSE41 || cpuFeatures().SSE42) result.mVec128[0] = _mm_dp_pd(mVec128[0], rhs.mVec128[0], 0x31);
{ return result.v[0] + (v[2] * rhs.v[2]);
result.mVec128[0] = _mm_dp_pd(mVec128[0], rhs.mVec128[0], 0x31); #else
return result.v[0] + (v[2] * rhs.v[2]);
}
#endif
result.mVec128[0] = _mm_mul_pd(mVec128[0], rhs.mVec128[0]); result.mVec128[0] = _mm_mul_pd(mVec128[0], rhs.mVec128[0]);
result.mVec128[1] = _mm_mul_pd(mVec128[1], rhs.mVec128[1]); result.mVec128[1] = _mm_mul_pd(mVec128[1], rhs.mVec128[1]);
return result.v[0] + result.v[1] + result.v[2]; return result.v[0] + result.v[1] + result.v[2];
#endif
#else #else
return (x * rhs.x) + (y * rhs.y) + (z * rhs.z); return (x * rhs.x) + (y * rhs.y) + (z * rhs.z);
#endif #endif

25
include/zeus/CVector3f.hpp
View File

@ -280,15 +280,13 @@ public:
{ {
#if __SSE__ #if __SSE__
TVectorUnion result; TVectorUnion result;
#if __SSE4_1__ || __SSE4_2__ #if __SSE4_1__
if (cpuFeatures().SSE41 || cpuFeatures().SSE42) result.mVec128 = _mm_dp_ps(mVec128, rhs.mVec128, 0x71);
{ return result.v[0];
result.mVec128 = _mm_dp_ps(mVec128, rhs.mVec128, 0x71); #else
return result.v[0];
}
#endif
result.mVec128 = _mm_mul_ps(mVec128, rhs.mVec128); result.mVec128 = _mm_mul_ps(mVec128, rhs.mVec128);
return result.v[0] + result.v[1] + result.v[2]; return result.v[0] + result.v[1] + result.v[2];
#endif
#else #else
return (x * rhs.x) + (y * rhs.y) + (z * rhs.z); return (x * rhs.x) + (y * rhs.y) + (z * rhs.z);
#endif #endif
@ -298,16 +296,13 @@ public:
{ {
#if __SSE__ #if __SSE__
TVectorUnion result; TVectorUnion result;
#if __SSE4_1__ || __SSE4_2__ #if __SSE4_1__
if (cpuFeatures().SSE41 || cpuFeatures().SSE42) result.mVec128 = _mm_dp_ps(mVec128, mVec128, 0x71);
{ return result.v[0];
result.mVec128 = _mm_dp_ps(mVec128, mVec128, 0x71); #else
return result.v[0];
}
#endif
result.mVec128 = _mm_mul_ps(mVec128, mVec128); result.mVec128 = _mm_mul_ps(mVec128, mVec128);
return result.v[0] + result.v[1] + result.v[2]; return result.v[0] + result.v[1] + result.v[2];
#endif
#else #else
return x * x + y * y + z * z; return x * x + y * y + z * z;
#endif #endif

25
include/zeus/CVector4f.hpp
View File

@ -312,16 +312,13 @@ public:
{ {
#if __SSE__ #if __SSE__
TVectorUnion result; TVectorUnion result;
#if __SSE4_1__ || __SSE4_2__ #if __SSE4_1__
if (cpuFeatures().SSE41 || cpuFeatures().SSE42) result.mVec128 = _mm_dp_ps(mVec128, rhs.mVec128, 0xF1);
{ return result.v[0];
result.mVec128 = _mm_dp_ps(mVec128, rhs.mVec128, 0xF1); #else
return result.v[0];
}
#endif
result.mVec128 = _mm_mul_ps(mVec128, rhs.mVec128); result.mVec128 = _mm_mul_ps(mVec128, rhs.mVec128);
return result.v[0] + result.v[1] + result.v[2] + result.v[3]; return result.v[0] + result.v[1] + result.v[2] + result.v[3];
#endif
#else #else
return (x * rhs.x) + (y * rhs.y) + (z * rhs.z) + (w * rhs.w); return (x * rhs.x) + (y * rhs.y) + (z * rhs.z) + (w * rhs.w);
#endif #endif
@ -330,15 +327,13 @@ public:
{ {
#if __SSE__ #if __SSE__
TVectorUnion result; TVectorUnion result;
#if __SSE4_1__ || __SSE4_2__ #if __SSE4_1__
if (cpuFeatures().SSE41 || cpuFeatures().SSE42) result.mVec128 = _mm_dp_ps(mVec128, mVec128, 0xF1);
{ return result.v[0];
result.mVec128 = _mm_dp_ps(mVec128, mVec128, 0xF1); #else
return result.v[0];
}
#endif
result.mVec128 = _mm_mul_ps(mVec128, mVec128); result.mVec128 = _mm_mul_ps(mVec128, mVec128);
return result.v[0] + result.v[1] + result.v[2]; return result.v[0] + result.v[1] + result.v[2];
#endif
#else #else
return x * x + y * y + z * z + w * w; return x * x + y * y + z * z + w * w;
#endif #endif