Mesa (master): mesa: Disable the debug spam for x86 CPU detection with a compile-time flag.

[Eric Anholt]

Module: Mesa
Branch: master
Commit: aa2f55883b9a4e8a192c5dcc97ae7fdab2a33e0a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=aa2f55883b9a4e8a192c5dcc97ae7fdab2a33e0a

Author: Eric Anholt <eric at anholt.net>
Date:   Wed Aug 25 23:26:29 2010 -0700

mesa: Disable the debug spam for x86 CPU detection with a compile-time flag.

I don't know of any problems with CPU detection in years.  Don't spam
the user that was just looking to enable assertions with this stuff.

---

 src/mesa/x86/common_x86.c |   20 +++++++++++++-------
 1 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/mesa/x86/common_x86.c b/src/mesa/x86/common_x86.c
index e8509a1..f763a3a 100644
--- a/src/mesa/x86/common_x86.c
+++ b/src/mesa/x86/common_x86.c
@@ -55,7 +55,7 @@
 /** Bitmask of X86_FEATURE_x bits */
 int _mesa_x86_cpu_features = 0x0;
 
-
+static int detection_debug = GL_FALSE;
 
 /* No reason for this to be public.
  */
@@ -190,7 +190,8 @@ void _mesa_check_os_sse_support( void )
 #else
    /* Do nothing on other platforms for now.
     */
-   _mesa_debug(NULL, "Not testing OS support for SSE, leaving enabled.\n");
+   if (detection_debug)
+      _mesa_debug(NULL, "Not testing OS support for SSE, leaving enabled.\n");
 #endif /* __FreeBSD__ */
 }
 
@@ -232,7 +233,8 @@ _mesa_get_x86_features(void)
        _mesa_x86_cpuid(0, &result, (GLuint *)(cpu_vendor + 0), (GLuint *)(cpu_vendor + 8), (GLuint *)(cpu_vendor + 4));
        cpu_vendor[12] = '\0';
 
-       _mesa_debug(NULL, "CPU vendor: %s\n", cpu_vendor);
+       if (detection_debug)
+	  _mesa_debug(NULL, "CPU vendor: %s\n", cpu_vendor);
 
        /* get cpu features */
        cpu_features = _mesa_x86_cpuid_edx(1);
@@ -284,7 +286,8 @@ _mesa_get_x86_features(void)
 		   _mesa_x86_cpuid(0x80000002+ofs, (GLuint *)(cpu_name + (16*ofs)+0), (GLuint *)(cpu_name + (16*ofs)+4), (GLuint *)(cpu_name + (16*ofs)+8), (GLuint *)(cpu_name + (16*ofs)+12));
 	       cpu_name[48] = '\0'; /* the name should be NULL terminated, but just to be sure */
 
-	       _mesa_debug(NULL, "CPU name: %s\n", cpu_name);
+	       if (detection_debug)
+		  _mesa_debug(NULL, "CPU name: %s\n", cpu_name);
 	   }
        }
 
@@ -293,7 +296,8 @@ _mesa_get_x86_features(void)
 #ifdef USE_MMX_ASM
    if ( cpu_has_mmx ) {
       if ( _mesa_getenv( "MESA_NO_MMX" ) == 0 ) {
-         _mesa_debug(NULL, "MMX cpu detected.\n");
+	 if (detection_debug)
+	    _mesa_debug(NULL, "MMX cpu detected.\n");
       } else {
          _mesa_x86_cpu_features &= ~(X86_FEATURE_MMX);
       }
@@ -303,7 +307,8 @@ _mesa_get_x86_features(void)
 #ifdef USE_3DNOW_ASM
    if ( cpu_has_3dnow ) {
       if ( _mesa_getenv( "MESA_NO_3DNOW" ) == 0 ) {
-         _mesa_debug(NULL, "3DNow! cpu detected.\n");
+	 if (detection_debug)
+	    _mesa_debug(NULL, "3DNow! cpu detected.\n");
       } else {
          _mesa_x86_cpu_features &= ~(X86_FEATURE_3DNOW);
       }
@@ -313,7 +318,8 @@ _mesa_get_x86_features(void)
 #ifdef USE_SSE_ASM
    if ( cpu_has_xmm ) {
       if ( _mesa_getenv( "MESA_NO_SSE" ) == 0 ) {
-         _mesa_debug(NULL, "SSE cpu detected.\n");
+	 if (detection_debug)
+	    _mesa_debug(NULL, "SSE cpu detected.\n");
          if ( _mesa_getenv( "MESA_FORCE_SSE" ) == 0 ) {
             _mesa_check_os_sse_support();
          }