summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2001-02-09 23:23:43 +0000
committerBrian Paul <[email protected]>2001-02-09 23:23:43 +0000
commitccc8b9239c8ae5c1f5364a5b99ffa3f8b5a731ab (patch)
treecf0b15bae3e87b4ba5a0c4f5a5dd8df64e343491 /src/mesa
parent18ce0f12540b016cbb08b7d304d80af0f7bb168b (diff)
minor changes from XFree86 (dawes)
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/x86/common_x86_asm.S10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/mesa/x86/common_x86_asm.S b/src/mesa/x86/common_x86_asm.S
index bb75830eb47..80ee4f8d080 100644
--- a/src/mesa/x86/common_x86_asm.S
+++ b/src/mesa/x86/common_x86_asm.S
@@ -1,8 +1,8 @@
-/* $Id: common_x86_asm.S,v 1.3 2000/12/06 14:41:47 gareth Exp $ */
+/* $Id: common_x86_asm.S,v 1.4 2001/02/09 23:23:43 brianp Exp $ */
/*
* Mesa 3-D graphics library
- * Version: 3.5
+ * Version: 3.4
*
* Copyright (C) 1999-2000 Brian Paul All Rights Reserved.
*
@@ -33,6 +33,7 @@
*
* Cleaned up and simplified by Gareth Hughes <[email protected]>
*/
+/* $XFree86: xc/extras/Mesa/src/X86/common_x86_asm.S,v 1.5 2000/12/12 23:52:37 dawes Exp $ */
#include "assyntax.h"
#include "common_x86_features.h"
@@ -58,8 +59,10 @@
GLNAME( found_intel ): STRING( "Genuine Intel processor found\n\0" )
GLNAME( found_amd ): STRING( "Authentic AMD processor found\n\0" )
+#ifdef USE_KATMAI_ASM
GLNAME( katmai_test_dummy ):
D_LONG 0x3f800000, 0x3f800000, 0x3f800000, 0x3f800000
+#endif
SEG_TEXT
@@ -155,6 +158,7 @@ LLBL ( cpuid_done ):
RET
+#ifdef USE_KATMAI_ASM
/* Execute an SSE instruction to see if the operating system correctly
* supports SSE. A signal handler for SIGILL should have been set
* before calling this function, otherwise this could kill the client
@@ -203,3 +207,5 @@ GLNAME( gl_test_os_katmai_exception_support ):
LEAVE
RET
+
+#endif