Move code to enable FP exceptions into debug.c (set MESA_DEBUG=fpexceptions).

Get rid of MESA_DEBUG preprocessor symbol, just use DEBUG instead.

diff --git a/src/mesa/main/debug.c b/src/mesa/main/debug.c
index c21122080bb2a5a767cbc9f5db8d73bc96858099..98ca65b96a998a61076e4e1c98e6f45720c8d7cc 100644 (file)
--- a/src/mesa/main/debug.c
+++ b/src/mesa/main/debug.c
@@ -149,7 +149,7 @@ void _mesa_print_info( void )
  */
 static void add_debug_flags( const char *debug )
 {
-#ifdef MESA_DEBUG
+#ifdef DEBUG
    if (_mesa_strstr(debug, "varray")) 
       MESA_VERBOSE |= VERBOSE_VARRAY;
 
@@ -184,6 +184,18 @@ static void add_debug_flags( const char *debug )
     */
    if (_mesa_strstr(debug, "flush")) 
       MESA_DEBUG_FLAGS |= DEBUG_ALWAYS_FLUSH;
+
+#if defined(_FPU_GETCW) && defined(_FPU_SETCW)
+   if (_mesa_strstr(debug, "fpexceptions")) {
+      /* raise FP exceptions */
+      fpu_control_t mask;
+      _FPU_GETCW(mask);
+      mask &= ~(_FPU_MASK_IM | _FPU_MASK_DM | _FPU_MASK_ZM
+                | _FPU_MASK_OM | _FPU_MASK_UM);
+      _FPU_SETCW(mask);
+   }
+#endif
+
 #else
    (void) debug;
 #endif

diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c
index de8456d3b7d2f72b577a8e7630070b247c74f31b..3aca054f79e5c363834ccfa5e80d99cbf4292dc8 100644 (file)
--- a/src/mesa/main/imports.c
+++ b/src/mesa/main/imports.c
@@ -1265,20 +1265,6 @@ _mesa_init_default_imports(__GLimports *imports, void *driverCtx)
    static GLboolean initialized = GL_FALSE;
    if (!initialized) {
       init_sqrt_table();
-
-#if defined(_FPU_GETCW) && defined(_FPU_SETCW)
-      {
-         const char *debug = _mesa_getenv("MESA_DEBUG");
-         if (debug && _mesa_strcmp(debug, "FP")==0) {
-            /* die on FP exceptions */
-            fpu_control_t mask;
-            _FPU_GETCW(mask);
-            mask &= ~(_FPU_MASK_IM | _FPU_MASK_DM | _FPU_MASK_ZM
-                      | _FPU_MASK_OM | _FPU_MASK_UM);
-            _FPU_SETCW(mask);
-         }
-      }
-#endif
       initialized = GL_TRUE;
    }
 

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index c2880b0cb39ffc5a54b9b0e9f6fa980503cf4b86..ba0d1c27dc206c85140407d802d3e4ee9325a2e1 100644 (file)
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -2929,7 +2929,7 @@ struct __GLcontextRec
 extern const char *_mesa_prim_name[GL_POLYGON+4];
 
 
-#ifdef MESA_DEBUG
+#ifdef DEBUG
 extern int MESA_VERBOSE;
 extern int MESA_DEBUG_FLAGS;
 # define MESA_FUNCTION __FUNCTION__