#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
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 || defined(_WIN32)
+#elif LONG_MAX == INT32_MAX
return _mm_cvtss_si32(_mm_load_ss(&x));
#else
-#error "Unsupported or undefined LONG_BIT"
+#error "Unsupported long size"
#endif
#else
return lrintf(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 || defined(_WIN32)
+#elif LONG_MAX == INT32_MAX
return _mm_cvtsd_si32(_mm_load_sd(&x));
#else
-#error "Unsupported or undefined LONG_BIT"
+#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