diff options
| author | Keith Whitwell <[email protected]> | 2003-11-21 15:49:24 +0000 |
|---|---|---|
| committer | Keith Whitwell <[email protected]> | 2003-11-21 15:49:24 +0000 |
| commit | 3ec97611d2dc04e27c2ab6a9b1c15ac0bbd0b589 (patch) | |
| tree | c1b8932d709403c2a3050714a9750978718ebf21 /src/mesa/x86/common_x86.c | |
| parent | f2f09abce4c6ac398eb8623ea89ec4419e48e2a4 (diff) | |
Merge head into branch
Diffstat (limited to 'src/mesa/x86/common_x86.c')
| -rw-r--r-- | src/mesa/x86/common_x86.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/mesa/x86/common_x86.c b/src/mesa/x86/common_x86.c index da572dfbf0a..ba0aaea94ed 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.22.4.1 2003/11/21 15:49:45 keithw 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 ) { |