From: Keith Whitwell <keith@tungstengraphics.com>
Date: Fri, 3 Sep 1999 15:48:54 +0000 (+0000)
Subject: more bugfixes
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=da54ffc852996f94dcf46b0cdc40c5ff12b55496;p=mesa.git

more bugfixes
---

diff --git a/src/mesa/x86/common_x86.c b/src/mesa/x86/common_x86.c
index ed258369299..94a9c1caf1d 100644
--- a/src/mesa/x86/common_x86.c
+++ b/src/mesa/x86/common_x86.c
@@ -42,12 +42,18 @@ void gl_init_all_x86_asm (void)
 {
 #ifdef USE_X86_ASM
    gl_x86_cpu_features = gl_identify_x86_cpu_features ();
+   gl_x86_cpu_features |= GL_CPU_AnyX86;
+
+   if (getenv("MESA_NO_ASM") != 0)
+      gl_x86_cpu_features = 0;
 
    if (gl_x86_cpu_features & GL_CPU_GenuineIntel) {
       fprintf (stderr, "GenuineIntel cpu detected.\n");
    }
-   gl_init_x86_asm_transforms ();
 
+   if (gl_x86_cpu_features) {
+      gl_init_x86_asm_transforms ();
+   }
 
 #ifdef USE_MMX_ASM
    if (gl_x86_cpu_features & GL_CPU_MMX) {