summaryrefslogtreecommitdiff
path: root/src/mesa
diff options
context:
space:
mode:
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/glapi/glx86asm.py3
-rw-r--r--src/mesa/main/dispatch.c2
-rw-r--r--src/mesa/x86/common_x86.c16
3 files changed, 10 insertions, 11 deletions
diff --git a/src/mesa/glapi/glx86asm.py b/src/mesa/glapi/glx86asm.py
index f881abeea9..ea0479720d 100644
--- a/src/mesa/glapi/glx86asm.py
+++ b/src/mesa/glapi/glx86asm.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
-# $Id: glx86asm.py,v 1.6 2002/06/11 01:26:58 brianp Exp $
+# $Id: glx86asm.py,v 1.7 2003/10/14 23:47:21 kendallb Exp $
# Mesa 3-D graphics library
# Version: 4.1
@@ -58,6 +58,7 @@ def PrintHead():
print '#define GLOBL_FN(x) GLOBL x'
print '#endif'
print ''
+ print 'SEG_TEXT'
print ''
print 'EXTERN GLNAME(_glapi_Dispatch)'
print ''
diff --git a/src/mesa/main/dispatch.c b/src/mesa/main/dispatch.c
index 87dc64f02d..4bda6e1047 100644
--- a/src/mesa/main/dispatch.c
+++ b/src/mesa/main/dispatch.c
@@ -41,7 +41,7 @@
#include "glthread.h"
-#if !(defined(USE_X86_ASM) || defined(USE_SPARC_ASM))
+#if !(defined(USE_X86_ASM) || defined(USE_SPARC_ASM)) || defined(__SCITECH_SNAP__)
#if defined(WIN32)
#define KEYWORD1 GLAPI
diff --git a/src/mesa/x86/common_x86.c b/src/mesa/x86/common_x86.c
index da572dfbf0..c29a104670 100644
--- a/src/mesa/x86/common_x86.c
+++ b/src/mesa/x86/common_x86.c
@@ -1,4 +1,4 @@
-/* $Id: common_x86.c,v 1.22 2003/02/04 02:22:51 brianp Exp $ */
+/* $Id: common_x86.c,v 1.23 2003/10/14 23:47:22 kendallb Exp $ */
/*
* Mesa 3-D graphics library
@@ -52,14 +52,12 @@ int _mesa_x86_cpu_features = 0;
/* No reason for this to be public.
*/
-extern int _mesa_identify_x86_cpu_features(void);
-
-extern GLuint _mesa_x86_has_cpuid(void);
-extern void _mesa_x86_cpuid(GLuint op, GLuint *reg_eax, GLuint *reg_ebx, GLuint *reg_ecx, GLuint *reg_edx);
-extern GLuint _mesa_x86_cpuid_eax(GLuint op);
-extern GLuint _mesa_x86_cpuid_ebx(GLuint op);
-extern GLuint _mesa_x86_cpuid_ecx(GLuint op);
-extern GLuint _mesa_x86_cpuid_edx(GLuint op);
+extern GLuint _ASMAPI _mesa_x86_has_cpuid(void);
+extern void _ASMAPI _mesa_x86_cpuid(GLuint op, GLuint *reg_eax, GLuint *reg_ebx, GLuint *reg_ecx, GLuint *reg_edx);
+extern GLuint _ASMAPI _mesa_x86_cpuid_eax(GLuint op);
+extern GLuint _ASMAPI _mesa_x86_cpuid_ebx(GLuint op);
+extern GLuint _ASMAPI _mesa_x86_cpuid_ecx(GLuint op);
+extern GLuint _ASMAPI _mesa_x86_cpuid_edx(GLuint op);
static void message( const char *msg )
{