fix some discrepancies in mathlib

Author: mastercoms

src/mathlib/3dnow.cpp

@@ -16,7 +16,7 @@
 // memdbgon must be the last include file in a .cpp file!!!
 #include "tier0/memdbgon.h"
 
-#if !defined(COMPILER_MSVC64) && !defined(LINUX)
+#if 0 && !defined( OSX ) && !defined( PLATFORM_WINDOWS_PC64 ) && !defined( LINUX )
 // Implement for 64-bit Windows if needed.
 // Clang hits "fatal error: error in backend:" and other errors when trying
 // to compile the inline assembly below. 3DNow support is highly unlikely to
@@ -194,4 +194,4 @@ float _3DNow_InvRSquared(const float* v)
 	return r2;
 }
 
-#endif // COMPILER_MSVC64 
+#endif // PLATFORM_WINDOWS_PC64 

src/mathlib/mathlib_base.cpp

@@ -3321,20 +3321,22 @@ void MathLib_Init( float gamma, float texGamma, float brightness, int overbright
 	pfFastSinCos = SinCos;
 	pfFastCos = cosf;
 
+#if 0
 	if ( bAllowMMX && pi.m_bMMX )
 	{
 		// Select the MMX specific routines if available
 		// (MMX routines were used by SW span fillers - not currently used for HW)
 		s_bMMXEnabled = true;
 	}
 	else
+#endif
 	{
 		s_bMMXEnabled = false;
 	}
 
 	// SSE Generally performs better than 3DNow when present, so this is placed 
 	// first to allow SSE to override these settings.
-#if !defined( OSX ) && !defined( PLATFORM_WINDOWS_PC64 ) && !defined(LINUX)
+#if 0 && !defined( OSX ) && !defined( PLATFORM_WINDOWS_PC64 ) && !defined( LINUX )
 	if ( bAllow3DNow && pi.m_b3DNow )
 	{
 		s_b3DNowEnabled = true;
@@ -3357,6 +3359,7 @@ void MathLib_Init( float gamma, float texGamma, float brightness, int overbright
 	{
 		s_bSSEEnabled = true;
 
+#if 0
 #ifndef PLATFORM_WINDOWS_PC64
 		// These are not yet available.
 		// Select the SSE specific routines if available
@@ -3370,6 +3373,7 @@ void MathLib_Init( float gamma, float texGamma, float brightness, int overbright
 #ifdef PLATFORM_WINDOWS_PC32
 		pfFastSinCos = _SSE_SinCos;
 		pfFastCos = _SSE_cos;
+#endif
 #endif
 	}
 	else
@@ -3380,9 +3384,11 @@ void MathLib_Init( float gamma, float texGamma, float brightness, int overbright
 	if ( bAllowSSE2 && pi.m_bSSE2 )
 	{
 		s_bSSE2Enabled = true;
+#if 0
 #ifdef PLATFORM_WINDOWS_PC32
 		pfFastSinCos = _SSE2_SinCos;
 		pfFastCos = _SSE2_cos;
+#endif
 #endif
 	} 
 	else

src/mathlib/sse.cpp

@@ -16,7 +16,7 @@
 // memdbgon must be the last include file in a .cpp file!!!
 #include "tier0/memdbgon.h"
 
-#ifndef COMPILER_MSVC64
+#if 0 && !defined( OSX ) && !defined( PLATFORM_WINDOWS_PC64 ) && !defined( LINUX )
 // Implement for 64-bit Windows if needed.
 
 static const uint32 _sincos_masks[]	  = { (uint32)0x0,  (uint32)~0x0 };
@@ -1104,4 +1104,4 @@ vec_t DotProduct (const vec_t *a, const vec_t *c)
 }
 */
 
-#endif // COMPILER_MSVC64 
+#endif // PLATFORM_WINDOWS_PC64 

src/mathlib/sse.h

@@ -7,6 +7,7 @@
 #ifndef _SSE_H
 #define _SSE_H
 
+#if 0
 float _SSE_Sqrt(float x);
 float _SSE_RSqrtAccurate(float a);
 float _SSE_RSqrtFast(float x);
@@ -23,5 +24,6 @@ float _SSE2_cos(float x);
 void VectorTransformSSE(const float *in1, const matrix3x4_t& in2, float *out1);
 void VectorRotateSSE( const float *in1, const matrix3x4_t& in2, float *out1 );
 #endif
+#endif
 
 #endif // _SSE_H

src/public/mathlib/ssemath.h

@@ -2509,7 +2509,7 @@ FORCEINLINE i32x4 IntShiftLeftWordSIMD(const i32x4 &vSrcA, const i32x4 &vSrcB)
 // like this.
 FORCEINLINE void ConvertStoreAsIntsSIMD(intx4 * RESTRICT pDest, const fltx4 &vSrc)
 {
-#if defined( COMPILER_MSVC64 )
+#if 1 || defined( COMPILER_MSVC64 )
 
 	(*pDest)[0] = SubFloat( vSrc, 0 );
 	(*pDest)[1] = SubFloat( vSrc, 1 );

src/public/mathlib/vector.h

@@ -2207,20 +2207,20 @@ inline void AngularImpulseToQAngle( const AngularImpulse &impulse, QAngle &angle
 FORCEINLINE vec_t InvRSquared( float const *v )
 {
 	// The compiler will make it good
-	return 1.f / ( v[0] * v[0] + v[1] * v[1] + v[2] * v[2] + 1.0e-10f );
+	return 1.f / ( v[0] * v[0] + v[1] * v[1] + v[2] * v[2] + FLT_EPSILON );
 }
 
 FORCEINLINE vec_t InvRSquared( const Vector &v )
 {
 	// The compiler will make it good
-	return 1.0f / ( v.x * v.x + v.y * v.y + v.z * v.z + 1.0e-10f );
+	return 1.0f / ( v.x * v.x + v.y * v.y + v.z * v.z + FLT_EPSILON );
 }
 
 // FIXME: Change this back to a #define once we get rid of the vec_t version
 FORCEINLINE float VectorNormalize( Vector& vec )
 {
 	// The compiler will make it good
-	const float len = sqrtf(vec.x * vec.x + vec.y * vec.y + vec.z * vec.z + 1.0e-10f);
+	const float len = sqrtf(vec.x * vec.x + vec.y * vec.y + vec.z * vec.z + FLT_EPSILON );
 	const float invlen = 1.0f / len;
 	vec.x *= invlen;
 	vec.y *= invlen;
@@ -2237,7 +2237,7 @@ FORCEINLINE float VectorNormalize( float * v )
 FORCEINLINE void VectorNormalizeFast( Vector &vec )
 {
 	// The previous version just called VectorNormalize but it's significant to be able to do a rsqrtss here.
-	const float invlen = 1.0f / sqrtf( vec.x * vec.x + vec.y * vec.y + vec.z * vec.z + 1.0e-10f );
+	const float invlen = 1.0f / sqrtf( vec.x * vec.x + vec.y * vec.y + vec.z * vec.z + FLT_EPSILON );
 	vec.x *= invlen;
 	vec.y *= invlen;
 	vec.z *= invlen;