From: Kenneth Graunke <kenneth@whitecape.org>
Date: Fri, 23 Aug 2019 18:08:48 +0000 (-0700)
Subject: util: Add a _mesa_i64roundevenf() helper.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b59914e179a9e5930af37e7f7c0d8eafd682caff;p=mesa.git

util: Add a _mesa_i64roundevenf() helper.

This always returns a int64_t, translating to _mesa_lroundevenf on
systems where long is 64-bit, and llrintf where "long long" is needed.

Fixes: 594fc0f8595 ("mesa: Replace F_TO_I() with _mesa_lroundevenf().")
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
---

diff --git a/src/util/rounding.h b/src/util/rounding.h
index dfc691eaf13..fd343ab929b 100644
--- a/src/util/rounding.h
+++ b/src/util/rounding.h
@@ -129,4 +129,20 @@ _mesa_lroundeven(double 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