Mesa (gallium-0.2): gallium: Use costum log2 for all windows builds.

Keith Whitwell keithw at kemper.freedesktop.org
Wed Nov 19 16:04:28 UTC 2008


Module: Mesa
Branch: gallium-0.2
Commit: 228afbc8e012769983c5504d60c0772c84359bb1
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=228afbc8e012769983c5504d60c0772c84359bb1

Author: José Fonseca <jrfonseca at tungstengraphics.com>
Date:   Mon Nov 17 16:40:21 2008 +0900

gallium: Use costum log2 for all windows builds.

---

 src/gallium/auxiliary/util/u_math.h |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/gallium/auxiliary/util/u_math.h b/src/gallium/auxiliary/util/u_math.h
index ac11d70..1ae3234 100644
--- a/src/gallium/auxiliary/util/u_math.h
+++ b/src/gallium/auxiliary/util/u_math.h
@@ -119,6 +119,7 @@ __inline double __cdecl atan2(double val)
 
 
 #if defined(_MSC_VER) 
+
 #if _MSC_VER < 1400 && !defined(__cplusplus) || defined(PIPE_SUBSYSTEM_WINDOWS_CE)
  
 static INLINE float cosf( float f ) 
@@ -161,12 +162,6 @@ static INLINE float logf( float f )
    return (float) log( (double) f );
 }
 
-static INLINE double log2( double x )
-{
-   const double invln2 = 1.442695041;
-   return log( x ) * invln2;
-}
-
 #else
 /* Work-around an extra semi-colon in VS 2005 logf definition */
 #ifdef logf
@@ -174,6 +169,13 @@ static INLINE double log2( double x )
 #define logf(x) ((float)log((double)(x)))
 #endif /* logf */
 #endif
+
+static INLINE double log2( double x )
+{
+   const double invln2 = 1.442695041;
+   return log( x ) * invln2;
+}
+
 #endif /* _MSC_VER */
 
 




More information about the mesa-commit mailing list