Added few more stubs so that control reaches to DestroyDevice().

[mesa.git] / src / util / rounding.h

diff --git a/src/util/rounding.h b/src/util/rounding.h
index b0c9918fd6e69500682b97b98dba97189988a2b5..e329d438244579ab1596b48ba7d5bd713cc8662b 100644 (file)
--- a/src/util/rounding.h
+++ b/src/util/rounding.h
@@ -24,10 +24,12 @@
 #ifndef _ROUNDING_H
 #define _ROUNDING_H
 
-#include <math.h>
+#include "c99_math.h"
+
 #include <limits.h>
+#include <stdint.h>
 
-#ifdef __x86_64__
+#if defined(__SSE__) || (defined(_M_IX86_FP) && (_M_IX86_FP >= 1)) || defined(_M_X64)
 #include <xmmintrin.h>
 #include <emmintrin.h>
 #endif
@@ -93,17 +95,20 @@ _mesa_roundeven(double x)
 static inline long
 _mesa_lroundevenf(float x)
 {
-#ifdef __x86_64__
-#if LONG_BIT == 64
+#if defined(__SSE__) || (defined(_M_IX86_FP) && (_M_IX86_FP >= 1)) || defined(_M_X64)
+#if LONG_MAX == INT64_MAX
    return _mm_cvtss_si64(_mm_load_ss(&x));
-#elif LONG_BIT == 32
+#elif LONG_MAX == INT32_MAX
    return _mm_cvtss_si32(_mm_load_ss(&x));
+#else
+#error "Unsupported long size"
 #endif
 #else
    return lrintf(x);
 #endif
 }
 
+
 /**
  * \brief Rounds \c x to the nearest integer, with ties to the even integer,
  * and returns the value as a long int.
@@ -111,15 +116,33 @@ _mesa_lroundevenf(float x)
 static inline long
 _mesa_lroundeven(double x)
 {
-#ifdef __x86_64__
-#if LONG_BIT == 64
+#if defined(__SSE2__) || (defined(_M_IX86_FP) && (_M_IX86_FP >= 2)) || defined(_M_X64)
+#if LONG_MAX == INT64_MAX
    return _mm_cvtsd_si64(_mm_load_sd(&x));
-#elif LONG_BIT == 32
+#elif LONG_MAX == INT32_MAX
    return _mm_cvtsd_si32(_mm_load_sd(&x));
+#else
+#error "Unsupported long size"
 #endif
 #else
    return lrint(x);
 #endif
 }
 
+/**
+ * \brief Rounds \c x to the nearest integer, with ties to the even integer,
+ * and returns the value as an int64_t.
+ */
+static inline int64_t
+_mesa_i64roundevenf(float x)
+{
+#if LONG_MAX == INT64_MAX
+   return _mesa_lroundevenf(x);
+#elif LONG_MAX == INT32_MAX
+   return llrintf(x);
+#else
+#error "Unsupported long size"
+#endif
+}
+
 #endif