diff options
| -rw-r--r-- | src/gallium/auxiliary/os/os_misc.h | 2 | ||||
| -rw-r--r-- | src/gallium/auxiliary/util/u_debug.c | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/src/gallium/auxiliary/os/os_misc.h b/src/gallium/auxiliary/os/os_misc.h index 5029ab96aac..582931fe96a 100644 --- a/src/gallium/auxiliary/os/os_misc.h +++ b/src/gallium/auxiliary/os/os_misc.h @@ -67,7 +67,7 @@ extern "C" { * Abort the program. */ #if defined(DEBUG) -# define os_abort() os_break() +# define os_abort() do { os_break(); abort(); } while(0) #else # define os_abort() abort() #endif diff --git a/src/gallium/auxiliary/util/u_debug.c b/src/gallium/auxiliary/util/u_debug.c index ae248e02081..fe517175eb1 100644 --- a/src/gallium/auxiliary/util/u_debug.c +++ b/src/gallium/auxiliary/util/u_debug.c @@ -274,10 +274,7 @@ void _debug_assert_fail(const char *expr, const char *function) { _debug_printf("%s:%u:%s: Assertion `%s' failed.\n", file, line, function, expr); - if (debug_get_bool_option("GALLIUM_ABORT_ON_ASSERT", TRUE)) - os_abort(); - else - _debug_printf("continuing...\n"); + os_abort(); } |