mesa/x86: fix a typos in SSE4.1 detection

[mesa.git] / src / mesa / x86 / common_x86.c

diff --git a/src/mesa/x86/common_x86.c b/src/mesa/x86/common_x86.c
index 08b1558975ab1e7f7169f82f418e8acd2b4e1c0f..ac77c9d77433e0fa937e59621142089e8725a7f0 100644 (file)
--- a/src/mesa/x86/common_x86.c
+++ b/src/mesa/x86/common_x86.c
@@ -47,7 +47,7 @@
 #include <sys/sysctl.h>
 #include <machine/cpu.h>
 #endif
-#if defined(__x86_64__) && !defined(_MSC_VER)
+#if defined(USE_X86_64_ASM)
 #include <cpuid.h>
 #endif
 
@@ -226,7 +226,7 @@ _mesa_get_x86_features(void)
        _mesa_debug(NULL, "CPUID not detected\n");
    }
    else {
-       GLuint cpu_features;
+       GLuint cpu_features, cpu_features_ecx;
        GLuint cpu_ext_features;
        GLuint cpu_ext_info;
        char cpu_vendor[13];
@@ -258,8 +258,8 @@ _mesa_get_x86_features(void)
           _mesa_x86_cpu_features |= X86_FEATURE_XMM;
        if (cpu_features & X86_CPU_XMM2)
           _mesa_x86_cpu_features |= X86_FEATURE_XMM2;
-       if (cpu_features & x86_CPU_SSE4_1)
-          _mesa_x86_features |= X86_FEATURE_SSE4_1;
+       if (cpu_features_ecx & X86_CPU_SSE4_1)
+          _mesa_x86_cpu_features |= X86_FEATURE_SSE4_1;
 #endif
 
        /* query extended cpu features */
@@ -336,7 +336,7 @@ _mesa_get_x86_features(void)
    }
 #endif
 
-#elif defined(__x86_64__) && !defined(_MSC_VER)
+#elif defined(USE_X86_64_ASM)
    unsigned int uninitialized_var(eax), uninitialized_var(ebx),
                 uninitialized_var(ecx), uninitialized_var(edx);
 
@@ -347,7 +347,7 @@ _mesa_get_x86_features(void)
 
    if (ecx & bit_SSE4_1)
       _mesa_x86_cpu_features |= X86_FEATURE_SSE4_1;
-#endif /* USE_X86_ASM */
+#endif /* USE_X86_64_ASM */
 
    (void) detection_debug;
 }