Commit aa2f5588 authored by Eric Anholt's avatar Eric Anholt

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.
parent 7af8f7f1
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
/** Bitmask of X86_FEATURE_x bits */ /** Bitmask of X86_FEATURE_x bits */
int _mesa_x86_cpu_features = 0x0; int _mesa_x86_cpu_features = 0x0;
static int detection_debug = GL_FALSE;
/* No reason for this to be public. /* No reason for this to be public.
*/ */
...@@ -190,7 +190,8 @@ void _mesa_check_os_sse_support( void ) ...@@ -190,7 +190,8 @@ void _mesa_check_os_sse_support( void )
#else #else
/* Do nothing on other platforms for now. /* 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__ */ #endif /* __FreeBSD__ */
} }
...@@ -232,7 +233,8 @@ _mesa_get_x86_features(void) ...@@ -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)); _mesa_x86_cpuid(0, &result, (GLuint *)(cpu_vendor + 0), (GLuint *)(cpu_vendor + 8), (GLuint *)(cpu_vendor + 4));
cpu_vendor[12] = '\0'; 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 */ /* get cpu features */
cpu_features = _mesa_x86_cpuid_edx(1); cpu_features = _mesa_x86_cpuid_edx(1);
...@@ -284,7 +286,8 @@ _mesa_get_x86_features(void) ...@@ -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)); _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 */ 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) ...@@ -293,7 +296,8 @@ _mesa_get_x86_features(void)
#ifdef USE_MMX_ASM #ifdef USE_MMX_ASM
if ( cpu_has_mmx ) { if ( cpu_has_mmx ) {
if ( _mesa_getenv( "MESA_NO_MMX" ) == 0 ) { 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 { } else {
_mesa_x86_cpu_features &= ~(X86_FEATURE_MMX); _mesa_x86_cpu_features &= ~(X86_FEATURE_MMX);
} }
...@@ -303,7 +307,8 @@ _mesa_get_x86_features(void) ...@@ -303,7 +307,8 @@ _mesa_get_x86_features(void)
#ifdef USE_3DNOW_ASM #ifdef USE_3DNOW_ASM
if ( cpu_has_3dnow ) { if ( cpu_has_3dnow ) {
if ( _mesa_getenv( "MESA_NO_3DNOW" ) == 0 ) { 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 { } else {
_mesa_x86_cpu_features &= ~(X86_FEATURE_3DNOW); _mesa_x86_cpu_features &= ~(X86_FEATURE_3DNOW);
} }
...@@ -313,7 +318,8 @@ _mesa_get_x86_features(void) ...@@ -313,7 +318,8 @@ _mesa_get_x86_features(void)
#ifdef USE_SSE_ASM #ifdef USE_SSE_ASM
if ( cpu_has_xmm ) { if ( cpu_has_xmm ) {
if ( _mesa_getenv( "MESA_NO_SSE" ) == 0 ) { 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 ) { if ( _mesa_getenv( "MESA_FORCE_SSE" ) == 0 ) {
_mesa_check_os_sse_support(); _mesa_check_os_sse_support();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment