diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2012-07-09 11:12:12 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2012-07-09 11:41:17 +0100 |
| commit | 8a9a17cd092d156272e8953974119f527b2b77eb (patch) | |
| tree | b3882d34ffe88c099a326b341ad565b307f9ec68 | |
| parent | b11bc37684181390fc1400afb44054785104ca15 (diff) | |
sna: Improve the check for assertions
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | src/sna/sna_driver.c | 8 |
2 files changed, 6 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index f1ffacc4..7ab7ab86 100644 --- a/configure.ac +++ b/configure.ac @@ -320,7 +320,6 @@ if test "x$DEBUG" = xno; then AC_DEFINE(NDEBUG,1,[Disable internal debugging]) fi if test "x$DEBUG" != xno; then - AC_DEFINE(HAS_EXTRA_DEBUG,1,[Enable additional debugging]) PKG_CHECK_MODULES(VALGRIND, [valgrind], have_valgrind=yes, have_valgrind=no) if test x$have_valgrind = xyes; then AC_DEFINE([HAVE_VALGRIND], 1, [Use valgrind intrinsics to suppress false warnings]) diff --git a/src/sna/sna_driver.c b/src/sna/sna_driver.c index e645ee63..484c982e 100644 --- a/src/sna/sna_driver.c +++ b/src/sna/sna_driver.c @@ -1100,14 +1100,18 @@ Bool sna_init_scrn(ScrnInfoPtr scrn, int entity_num) xf86DrvMsg(scrn->scrnIndex, X_INFO, "SNA compiled: %s\n", BUILDER_DESCRIPTION); #endif -#if HAS_EXTRA_DEBUG +#if !NDEBUG xf86DrvMsg(scrn->scrnIndex, X_INFO, - "SNA compiled with debugging enabled\n"); + "SNA compiled with assertions enabled\n"); #endif #if DEBUG_MEMORY xf86DrvMsg(scrn->scrnIndex, X_INFO, "SNA compiled with memory allocation reporting enabled\n"); #endif +#if DEBUG_PIXMAP + xf86DrvMsg(scrn->scrnIndex, X_INFO, + "SNA compiled with extra pixmap/damage validation\n"); +#endif DBG(("%s\n", __FUNCTION__)); DBG(("pixman version: %s\n", pixman_version_string())); |