X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fx86-64%2Fx86-64.c;h=d484038ee78547e9cd961cd0f71ccbb111b038fa;hb=6aea39641a6c32f780c40e3344096d3e0eccb590;hp=96f8da87f050775e4005b8a8ee0d6aa084b2e88f;hpb=ee0735fa2d4b2d2a9eae1f55e8f93f1f57feaf6d;p=mesa.git

diff --git a/src/mesa/x86-64/x86-64.c b/src/mesa/x86-64/x86-64.c
index 96f8da87f05..d484038ee78 100644
--- a/src/mesa/x86-64/x86-64.c
+++ b/src/mesa/x86-64/x86-64.c
@@ -1,7 +1,6 @@
 
 /*
  * Mesa 3-D graphics library
- * Version:  6.3
  *
  * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
  *
@@ -18,9 +17,10 @@
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
  */
 
 /*
@@ -35,7 +35,7 @@
 #include "math/m_xform.h"
 #include "tnl/t_context.h"
 #include "x86-64.h"
-#include "../x86/common_x86_macros.h"
+#include "../x86/x86_xform.h"
 
 #ifdef DEBUG
 #include "math/m_debug.h"
@@ -64,17 +64,7 @@ extern void _mesa_x86_64_transform_points4_2d( XFORM_ARGS );
 #ifdef USE_X86_64_ASM
 static void message( const char *msg )
 {
-   GLboolean debug;
-#ifdef DEBUG
-   debug = GL_TRUE;
-#else
-   if ( _mesa_getenv( "MESA_DEBUG" ) ) {
-      debug = GL_TRUE;
-   } else {
-      debug = GL_FALSE;
-   }
-#endif
-   if ( debug ) {
+   if (getenv("MESA_DEBUG")) {
       _mesa_debug( NULL, "%s", msg );
    }
 }
@@ -86,7 +76,7 @@ void _mesa_init_all_x86_64_transform_asm(void)
 #ifdef USE_X86_64_ASM
    unsigned int regs[4];
 
-   if ( _mesa_getenv( "MESA_NO_ASM" ) ) {
+   if ( getenv( "MESA_NO_ASM" ) ) {
      return;
    }