fix incorrect texcoord attribute index

[mesa.git] / src / mesa / x86 / common_x86.c

diff --git a/src/mesa/x86/common_x86.c b/src/mesa/x86/common_x86.c
index da572dfbf0ab2dbf7de36eac74934fed520fcf32..a8daada84966da33c8fd589a46fde61c9ba0a2a5 100644 (file)
--- a/src/mesa/x86/common_x86.c
+++ b/src/mesa/x86/common_x86.c
@@ -1,10 +1,8 @@
-/* $Id: common_x86.c,v 1.22 2003/02/04 02:22:51 brianp Exp $ */
-
 /*
  * Mesa 3-D graphics library
- * Version:  5.0
+ * Version:  6.0.1
  *
- * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -33,8 +31,7 @@
  * new Katmai functions.
  */
 
-#include <stdlib.h>
-#include <stdio.h>
+/* XXX these includes should probably go into imports.h or glheader.h */
 #if defined(USE_SSE_ASM) && defined(__linux__)
 #include <signal.h>
 #endif
@@ -43,7 +40,6 @@
 #include <sys/sysctl.h>
 #endif
 
-#include "context.h"
 #include "common_x86_asm.h"
 #include "imports.h"
 
@@ -52,14 +48,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 )
 {
@@ -67,7 +61,7 @@ static void message( const char *msg )
 #ifdef DEBUG
    debug = GL_TRUE;
 #else
-   if ( getenv( "MESA_DEBUG" ) ) {
+   if ( _mesa_getenv( "MESA_DEBUG" ) ) {
       debug = GL_TRUE;
    } else {
       debug = GL_FALSE;
@@ -324,7 +318,7 @@ void _mesa_init_all_x86_transform_asm( void )
 
    }
    
-   if ( getenv( "MESA_NO_ASM" ) ) {
+   if ( _mesa_getenv( "MESA_NO_ASM" ) ) {
       _mesa_x86_cpu_features = 0;
    }
 
@@ -334,7 +328,7 @@ void _mesa_init_all_x86_transform_asm( void )
 
 #ifdef USE_MMX_ASM
    if ( cpu_has_mmx ) {
-      if ( getenv( "MESA_NO_MMX" ) == 0 ) {
+      if ( _mesa_getenv( "MESA_NO_MMX" ) == 0 ) {
          message( "MMX cpu detected.\n" );
       } else {
          _mesa_x86_cpu_features &= ~(X86_FEATURE_MMX);
@@ -344,7 +338,7 @@ void _mesa_init_all_x86_transform_asm( void )
 
 #ifdef USE_3DNOW_ASM
    if ( cpu_has_3dnow ) {
-      if ( getenv( "MESA_NO_3DNOW" ) == 0 ) {
+      if ( _mesa_getenv( "MESA_NO_3DNOW" ) == 0 ) {
          message( "3DNow! cpu detected.\n" );
          _mesa_init_3dnow_transform_asm();
       } else {
@@ -354,15 +348,15 @@ void _mesa_init_all_x86_transform_asm( void )
 #endif
 
 #ifdef USE_SSE_ASM
-   if ( cpu_has_xmm && getenv( "MESA_FORCE_SSE" ) == 0 ) {
+   if ( cpu_has_xmm && _mesa_getenv( "MESA_FORCE_SSE" ) == 0 ) {
       check_os_sse_support();
    }
    if ( cpu_has_xmm ) {
-      if ( getenv( "MESA_NO_SSE" ) == 0 ) {
+      if (_mesa_getenv( "MESA_NO_SSE" ) == 0 ) {
          message( "SSE cpu detected.\n" );
          _mesa_init_sse_transform_asm();
       } else {
-         message( "SSE cpu detected, but switched off by user.\n" );
+          message( "SSE cpu detected, but switched off by user.\n" );
          _mesa_x86_cpu_features &= ~(X86_FEATURE_XMM);
       }
    }