mesa: Add "OR COPYRIGHT HOLDERS" to license text disclaiming liability.

[mesa.git] / src / mesa / x86 / common_x86.c

diff --git a/src/mesa/x86/common_x86.c b/src/mesa/x86/common_x86.c
index e8509a1edd5c302d2667bfda04108f4811562610..aa24dc6464302aee6a7cc71e1e832b280a7a918a 100644 (file)
--- a/src/mesa/x86/common_x86.c
+++ b/src/mesa/x86/common_x86.c
@@ -17,7 +17,7 @@
  * 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
+ * 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.
  */
@@ -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.
  */
@@ -82,7 +82,7 @@ extern void _mesa_test_os_sse_support( void );
 extern void _mesa_test_os_sse_exception_support( void );
 
 
-#if defined(WIN32)
+#if defined(_WIN32)
 #ifndef STATUS_FLOAT_MULTIPLE_TRAPS
 # define STATUS_FLOAT_MULTIPLE_TRAPS (0xC00002B5L)
 #endif
@@ -110,7 +110,7 @@ static LONG WINAPI ExceptionFilter(LPEXCEPTION_POINTERS exp)
 
    return EXCEPTION_CONTINUE_EXECUTION;
 }
-#endif /* WIN32 */
+#endif /* _WIN32 */
 
 
 /**
@@ -149,7 +149,7 @@ void _mesa_check_os_sse_support( void )
       if (ret || !enabled)
          _mesa_x86_cpu_features &= ~(X86_FEATURE_XMM);
    }
-#elif defined(WIN32)
+#elif defined(_WIN32)
    LPTOP_LEVEL_EXCEPTION_FILTER oldFilter;
    
    /* Install our ExceptionFilter */
@@ -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();
          }
@@ -325,4 +331,6 @@ _mesa_get_x86_features(void)
 #endif
 
 #endif /* USE_X86_ASM */
+
+   (void) detection_debug;
 }