From 81a22ef53953d950052c7bd5a282e96107a25f24 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Fri, 7 Oct 2005 17:18:51 +0000
Subject: [PATCH] MATH_DEBUG changes from bug #4468.

---
 configs/linux-debug           | 2 +-
 configs/linux-x86-64-debug    | 2 +-
 configs/linux-x86-debug       | 2 +-
 src/mesa/math/m_debug_clip.c  | 4 ++--
 src/mesa/math/m_debug_norm.c  | 5 ++---
 src/mesa/math/m_debug_util.h  | 4 ++--
 src/mesa/math/m_debug_xform.c | 4 ++--
 src/mesa/math/m_xform.c       | 4 ++--
 src/mesa/x86/3dnow.c          | 6 +++---
 src/mesa/x86/sse.c            | 4 ++--
 src/mesa/x86/x86.c            | 6 +++---
 11 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/configs/linux-debug b/configs/linux-debug
index ff4d1c33b5f..d5c93597b29 100644
--- a/configs/linux-debug
+++ b/configs/linux-debug
@@ -5,4 +5,4 @@ include $(TOP)/configs/linux
 CONFIG_NAME = linux-debug
 
 OPT_FLAGS = -g
-DEFINES += -DDEBUG -DMESA_DEBUG -DRUN_DEBUG_BENCHMARK
+DEFINES += -DDEBUG -DMESA_DEBUG -DDEBUG_MATH
diff --git a/configs/linux-x86-64-debug b/configs/linux-x86-64-debug
index bbdaec80143..d16f48790cd 100644
--- a/configs/linux-x86-64-debug
+++ b/configs/linux-x86-64-debug
@@ -4,4 +4,4 @@ include $(TOP)/configs/linux-x86-64
 
 CONFIG_NAME = linux-x86-64-debug
 
-DEFINES += -DDEBUG -DMESA_DEBUG -DRUN_DEBUG_BENCHMARK
+DEFINES += -DDEBUG -DMESA_DEBUG -DDEBUG_MATH
diff --git a/configs/linux-x86-debug b/configs/linux-x86-debug
index dbb970300e4..874d76fd883 100644
--- a/configs/linux-x86-debug
+++ b/configs/linux-x86-debug
@@ -6,4 +6,4 @@ include $(TOP)/configs/linux-x86
 CONFIG_NAME = linux-x86-debug
 
 OPT_FLAGS = -g
-DEFINES += -DDEBUG -DMESA_DEBUG -DRUN_DEBUG_BENCHMARK
+DEFINES += -DDEBUG -DMESA_DEBUG -DDEBUG_MATH
diff --git a/src/mesa/math/m_debug_clip.c b/src/mesa/math/m_debug_clip.c
index ae8108b88a1..334f3ef0302 100644
--- a/src/mesa/math/m_debug_clip.c
+++ b/src/mesa/math/m_debug_clip.c
@@ -41,7 +41,7 @@
 static char dummy;
 #endif
 
-#ifdef DEBUG  /* This code only used for debugging */
+#ifdef DEBUG_MATH  /* This code only used for debugging */
 
 static clip_func *clip_tab[2] = {
    _mesa_clip_tab,
@@ -368,4 +368,4 @@ void _math_test_all_cliptest_functions( char *description )
 }
 
 
-#endif /* DEBUG */
+#endif /* DEBUG_MATH */
diff --git a/src/mesa/math/m_debug_norm.c b/src/mesa/math/m_debug_norm.c
index 9bb46598158..11cae6bba7a 100644
--- a/src/mesa/math/m_debug_norm.c
+++ b/src/mesa/math/m_debug_norm.c
@@ -43,7 +43,7 @@
 static char dummy;
 #endif
 
-#ifdef DEBUG  /* This code only used for debugging */
+#ifdef DEBUG_MATH  /* This code only used for debugging */
 
 
 static int m_norm_identity[16] = {
@@ -375,10 +375,9 @@ void _math_test_all_normal_transform_functions( char *description )
 #ifdef RUN_DEBUG_BENCHMARK
    if ( mesa_profile ) {
       _mesa_printf( "\n" );
-      fflush( stdout );
    }
 #endif
 }
 
 
-#endif /* DEBUG */
+#endif /* DEBUG_MATH */
diff --git a/src/mesa/math/m_debug_util.h b/src/mesa/math/m_debug_util.h
index 1b7d742a80b..f7ce4679b6d 100644
--- a/src/mesa/math/m_debug_util.h
+++ b/src/mesa/math/m_debug_util.h
@@ -29,7 +29,7 @@
 #define __M_DEBUG_UTIL_H__
 
 
-#ifdef DEBUG  /* This code only used for debugging */
+#ifdef DEBUG_MATH  /* This code only used for debugging */
 
 
 /* Comment this out to deactivate the cycle counter.
@@ -315,6 +315,6 @@ enum { NIL = 0, ONE = 1, NEG = -1, VAR = 2 };
 #endif
 
 
-#endif /* DEBUG */
+#endif /* DEBUG_MATH */
 
 #endif /* __M_DEBUG_UTIL_H__ */
diff --git a/src/mesa/math/m_debug_xform.c b/src/mesa/math/m_debug_xform.c
index feed539eacb..2af837cf64b 100644
--- a/src/mesa/math/m_debug_xform.c
+++ b/src/mesa/math/m_debug_xform.c
@@ -42,7 +42,7 @@
 static char dummy;
 #endif
 
-#ifdef DEBUG  /* This code only used for debugging */
+#ifdef DEBUG_MATH  /* This code only used for debugging */
 
 
 /* Overhead of profiling counter in cycles.  Automatically adjusted to
@@ -335,4 +335,4 @@ void _math_test_all_transform_functions( char *description )
 }
 
 
-#endif /* DEBUG */
+#endif /* DEBUG_MATH */
diff --git a/src/mesa/math/m_xform.c b/src/mesa/math/m_xform.c
index 5366e34989c..fa3f57a8e5a 100644
--- a/src/mesa/math/m_xform.c
+++ b/src/mesa/math/m_xform.c
@@ -43,7 +43,7 @@
 #include "mathmod.h"
 
 
-#ifdef DEBUG
+#ifdef DEBUG_MATH
 #include "m_debug.h"
 #endif
 
@@ -204,7 +204,7 @@ _math_init_transformation( void )
    init_copy0();
    init_dotprod();
 
-#ifdef DEBUG
+#ifdef DEBUG_MATH
    _math_test_all_transform_functions( "default" );
    _math_test_all_normal_transform_functions( "default" );
    _math_test_all_cliptest_functions( "default" );
diff --git a/src/mesa/x86/3dnow.c b/src/mesa/x86/3dnow.c
index c0a4e7a1751..032aa661f44 100644
--- a/src/mesa/x86/3dnow.c
+++ b/src/mesa/x86/3dnow.c
@@ -1,4 +1,4 @@
-/* $Id: 3dnow.c,v 1.23 2003/03/29 16:38:37 brianp Exp $ */
+/* $Id: 3dnow.c,v 1.24 2005/10/07 17:18:52 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -37,7 +37,7 @@
 #include "3dnow.h"
 #include "common_x86_macros.h"
 
-#ifdef DEBUG
+#ifdef DEBUG_MATH
 #include "math/m_debug.h"
 #endif
 
@@ -84,7 +84,7 @@ void _mesa_init_3dnow_transform_asm( void )
    ASSIGN_NORM_GROUP( 3dnow );
    */
 
-#ifdef DEBUG
+#ifdef DEBUG_MATH
    _math_test_all_transform_functions( "3DNow!" );
    _math_test_all_normal_transform_functions( "3DNow!" );
 #endif
diff --git a/src/mesa/x86/sse.c b/src/mesa/x86/sse.c
index 45852c4e1c0..4b016a1e850 100644
--- a/src/mesa/x86/sse.c
+++ b/src/mesa/x86/sse.c
@@ -35,7 +35,7 @@
 #include "sse.h"
 #include "common_x86_macros.h"
 
-#ifdef DEBUG
+#ifdef DEBUG_MATH
 #include "math/m_debug.h"
 #endif
 
@@ -114,7 +114,7 @@ void _mesa_init_sse_transform_asm( void )
    ASSIGN_NORM_GROUP( sse );
 #endif
 
-#ifdef DEBUG
+#ifdef DEBUG_MATH
    _math_test_all_transform_functions( "SSE" );
    _math_test_all_normal_transform_functions( "SSE" );
 #endif
diff --git a/src/mesa/x86/x86.c b/src/mesa/x86/x86.c
index 16586b9727d..6b74e9e375f 100644
--- a/src/mesa/x86/x86.c
+++ b/src/mesa/x86/x86.c
@@ -1,4 +1,4 @@
-/* $Id: x86.c,v 1.25 2002/04/09 14:58:03 keithw Exp $ */
+/* $Id: x86.c,v 1.26 2005/10/07 17:18:52 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -36,7 +36,7 @@
 #include "x86.h"
 #include "common_x86_macros.h"
 
-#ifdef DEBUG
+#ifdef DEBUG_MATH
 #include "math/m_debug.h"
 #endif
 
@@ -87,7 +87,7 @@ void _mesa_init_x86_transform_asm( void )
    _mesa_clip_tab[4] = _mesa_x86_cliptest_points4;
    _mesa_clip_np_tab[4] = _mesa_x86_cliptest_points4_np;
 
-#ifdef DEBUG
+#ifdef DEBUG_MATH
    _math_test_all_transform_functions( "x86" );
    _math_test_all_cliptest_functions( "x86" );
 #endif
-- 
2.30.2