Mesa (master): util: do not assume MSVC implies SSE

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 06099d0e0c200d65a2a956bcdcf414b2802dc9c7
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=06099d0e0c200d65a2a956bcdcf414b2802dc9c7

Author: Erik Faye-Lund <erik.faye-lund at collabora.com>
Date:   Wed Aug 14 22:28:12 2019 +0200

util: do not assume MSVC implies SSE

This is not true for MSVC on ARM.

Signed-off-by: Erik Faye-Lund <erik.faye-lund at collabora.com>
Reviewed-by: Matt Turner <mattst88 at gmail.com>

---

 src/util/rounding.h | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/util/rounding.h b/src/util/rounding.h
index 8e302921c9d..d3fe8edb7f8 100644
--- a/src/util/rounding.h
+++ b/src/util/rounding.h
@@ -29,8 +29,7 @@
 #include <limits.h>
 #include <stdint.h>
 
-#if defined(__SSE__) || defined(_MSC_VER)
-/* MSVC always has SSE nowadays */
+#if defined(__SSE__) || (defined(_M_IX86_FP) && (_M_IX86_FP >= 1)) || defined(_M_X64)
 #include <xmmintrin.h>
 #include <emmintrin.h>
 #endif
@@ -96,7 +95,7 @@ _mesa_roundeven(double x)
 static inline long
 _mesa_lroundevenf(float x)
 {
-#if defined(__SSE__) || defined(_MSC_VER)
+#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_MAX == INT32_MAX
@@ -116,7 +115,7 @@ _mesa_lroundevenf(float x)
 static inline long
 _mesa_lroundeven(double x)
 {
-#if defined(__SSE2__) || defined(_MSC_VER)
+#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_MAX == INT32_MAX