util/strndup: move header inclusion as applicable

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

diff --git a/src/util/rounding.h b/src/util/rounding.h
index 088cf86dd08a1636437b71f932d7ecc66743c642..dfc691eaf1369f21c0375059a5da0ba8e299afc2 100644 (file)
--- a/src/util/rounding.h
+++ b/src/util/rounding.h
@@ -24,7 +24,16 @@
 #ifndef _ROUNDING_H
 #define _ROUNDING_H
 
-#include <math.h>
+#include "c99_math.h"
+
+#include <limits.h>
+#include <stdint.h>
+
+#if defined(__SSE__) || defined(_MSC_VER)
+/* MSVC always has SSE nowadays */
+#include <xmmintrin.h>
+#include <emmintrin.h>
+#endif
 
 #ifdef __SSE4_1__
 #include <smmintrin.h>
@@ -87,7 +96,17 @@ _mesa_roundeven(double x)
 static inline long
 _mesa_lroundevenf(float x)
 {
+#if defined(__SSE__) || defined(_MSC_VER)
+#if LONG_MAX == INT64_MAX
+   return _mm_cvtss_si64(_mm_load_ss(&x));
+#elif LONG_MAX == INT32_MAX
+   return _mm_cvtss_si32(_mm_load_ss(&x));
+#else
+#error "Unsupported long size"
+#endif
+#else
    return lrintf(x);
+#endif
 }
 
 /**
@@ -97,7 +116,17 @@ _mesa_lroundevenf(float x)
 static inline long
 _mesa_lroundeven(double x)
 {
+#if defined(__SSE__) || defined(_MSC_VER)
+#if LONG_MAX == INT64_MAX
+   return _mm_cvtsd_si64(_mm_load_sd(&x));
+#elif LONG_MAX == INT32_MAX
+   return _mm_cvtsd_si32(_mm_load_sd(&x));
+#else
+#error "Unsupported long size"
+#endif
+#else
    return lrint(x);
+#endif
 }
 
 #endif