summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Hourihane <alanh@tungstengraphics.com>2002-11-10 23:15:35 +0000
committerAlan Hourihane <alanh@tungstengraphics.com>2002-11-10 23:15:35 +0000
commitea3ce085ab46ead05ce384f82194a487997883e1 (patch)
tree02f4204abe6eebac779bc8b8cda0b2b2cc6a89cd
parentfcb33232e527d402876e80b9188c284aef598e98 (diff)
fix 3dnow misdetection on new p4's (from trunk)
-rw-r--r--src/mesa/x86/common_x86_asm.S7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/mesa/x86/common_x86_asm.S b/src/mesa/x86/common_x86_asm.S
index e82b1775ed..bac5dc79cc 100644
--- a/src/mesa/x86/common_x86_asm.S
+++ b/src/mesa/x86/common_x86_asm.S
@@ -1,4 +1,4 @@
-/* $Id: common_x86_asm.S,v 1.7.2.4 2002/09/19 16:06:13 brianp Exp $ */
+/* $Id: common_x86_asm.S,v 1.7.2.5 2002/11/10 23:15:35 alanh Exp $ */
/*
* Mesa 3-D graphics library
@@ -117,6 +117,11 @@ GLNAME( _mesa_identify_x86_cpu_features ):
MOV_L ( CONST(0x1), EAX )
CPUID
MOV_L ( EDX, EAX )
+
+ /* Mask out highest bit, which is used by AMD for 3dnow
+ * Newer Intel have this bit set, but do not support 3dnow
+ */
+ AND_L ( CONST(0X7FFFFFFF), EAX)
JMP ( LLBL(cpuid_done) )
LLBL(cpuid_amd):