MATH_DEBUG changes from bug #4468.

diff --git a/configs/linux-debug b/configs/linux-debug
index ff4d1c33b5f39f4507a9dcdc6a19965d17f5f31f..d5c93597b29b16ac4a96eb6eccbcf85d02716461 100644 (file)
--- 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 bbdaec80143c79d616250c0d5d656c94f0cbbf57..d16f48790cd9746be46c438e2e87f63c151a8fbb 100644 (file)
--- 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 dbb970300e4f1685e41cc45d376f01b9e031c1dc..874d76fd883157ea36997a2d2436c06b738f8fbc 100644 (file)
--- 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 ae8108b88a142e36e45bb79e23958fc4a4e24793..334f3ef030219b8689ab70f1156e9970c8491580 100644 (file)
--- 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 9bb46598158e8f6ae2e5a7672cbcbfab3dcc87f5..11cae6bba7a5e89482243204952b2c3c13f75588 100644 (file)
--- 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 1b7d742a80b63697b4a444abb9d584aabbb3706e..f7ce4679b6d5ea4c3f73eb49e41a5f65f0bd2095 100644 (file)
--- 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 feed539eacb8ffb08403425df29d587739b6c052..2af837cf64bbe8dde6a5e272f0e7ff0f6f5a89cd 100644 (file)
--- 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 5366e34989ceb29dd6795eaea23ce76dd6fbb905..fa3f57a8e5a8e7d458cf3f79e3c1f692b2bab9dd 100644 (file)
--- 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 c0a4e7a1751aed0df6572f67bc546a3c050f1cd7..032aa661f44d38993b6671ff49584e1bd21bcfea 100644 (file)
--- 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 45852c4e1c0597b361d1ce848bc31310a4149a12..4b016a1e85060444efa3d995acfd074942ff45e1 100644 (file)
--- 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 16586b9727df9d245ebe987944fa8c00e5352d43..6b74e9e375f2196e4bf23b90b43c99e706bdb79d 100644 (file)
--- 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