summaryrefslogtreecommitdiffstats
path: root/src/mesa/main
diff options
context:
space:
mode:
authorMatt Turner <[email protected]>2014-05-02 12:10:17 -0700
committerMatt Turner <[email protected]>2014-05-22 10:17:16 -0700
commit8b9302f2b4b0536abb91cb73682ec13640fe9eaf (patch)
tree6e872c26b8ac812217e4488db7d89a59f93108c3 /src/mesa/main
parent1a31657a9b14c77fa6eb4517629006d2e9ac2ad4 (diff)
mesa/x86: Support SSE 4.1 detection on x86-64.
Uses the cpuid.h header provided by gcc and clang. Other platforms are encouraged to switch.
Diffstat (limited to 'src/mesa/main')
-rw-r--r--src/mesa/main/cpuinfo.c2
-rw-r--r--src/mesa/main/cpuinfo.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/main/cpuinfo.c b/src/mesa/main/cpuinfo.c
index 8d482a6ac14..73e295c75b7 100644
--- a/src/mesa/main/cpuinfo.c
+++ b/src/mesa/main/cpuinfo.c
@@ -34,7 +34,7 @@
void
_mesa_get_cpu_features(void)
{
-#ifdef USE_X86_ASM
+#if defined USE_X86_ASM || (defined __x86_64__ && !defined _MSC_VER)
_mesa_get_x86_features();
#endif
}
diff --git a/src/mesa/main/cpuinfo.h b/src/mesa/main/cpuinfo.h
index 36788890558..fcd611e42e7 100644
--- a/src/mesa/main/cpuinfo.h
+++ b/src/mesa/main/cpuinfo.h
@@ -27,7 +27,7 @@
#define CPUINFO_H
-#if defined(USE_X86_ASM)
+#if defined USE_X86_ASM || (defined __x86_64__ && !defined _MSC_VER)
#include "x86/common_x86_asm.h"
#endif