diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2005-11-10 05:10:25 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2005-11-10 05:10:25 +0000 |
| commit | 1984aabe8362ee2b29711d2fa08e56e341eafddd (patch) | |
| tree | 37f4153a9b3db927c7a80a077eb90d7144cffb25 /src | |
| parent | a8446f72f45008974e356d103c2961d334a825c3 (diff) | |
Move code to enable FP exceptions into debug.c (set MESA_DEBUG=fpexceptions).
Get rid of MESA_DEBUG preprocessor symbol, just use DEBUG instead.
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/main/debug.c | 14 | ||||
| -rw-r--r-- | src/mesa/main/imports.c | 14 | ||||
| -rw-r--r-- | src/mesa/main/mtypes.h | 2 |
3 files changed, 14 insertions, 16 deletions
diff --git a/src/mesa/main/debug.c b/src/mesa/main/debug.c index c21122080b..98ca65b96a 100644 --- 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 de8456d3b7..3aca054f79 100644 --- 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 c2880b0cb3..ba0d1c27dc 100644 --- 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__ |