i965: Replace 'noann' debug flag with 'ann'.

Reviewed-by: Ben Widawsky <ben@bwidawsk.net>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Jason Ekstrand <jason.ekstrand@intel.com>

diff --git a/src/mesa/drivers/dri/i965/intel_asm_annotation.c b/src/mesa/drivers/dri/i965/intel_asm_annotation.c
index 37ad09095f5e36557a504d202f844cccf53fd077..ac1265561071c0cd95c30f6839c46d971719e784 100644 (file)
--- a/src/mesa/drivers/dri/i965/intel_asm_annotation.c
+++ b/src/mesa/drivers/dri/i965/intel_asm_annotation.c
@@ -109,7 +109,7 @@ void annotate(struct brw_context *brw,
 
    struct annotation *ann = &annotation->ann[annotation->ann_count++];
    ann->offset = offset;
-   if ((INTEL_DEBUG & DEBUG_NO_ANNOTATION) == 0) {
+   if ((INTEL_DEBUG & DEBUG_ANNOTATION) != 0) {
       ann->ir = inst->ir;
       ann->annotation = inst->annotation;
    }

diff --git a/src/mesa/drivers/dri/i965/intel_debug.c b/src/mesa/drivers/dri/i965/intel_debug.c
index 6391cf74ab6bf99ca2bd9587322ccd3af695421f..1dd2b1db4b83f692a5c60f4bb250a107211c3f06 100644 (file)
--- a/src/mesa/drivers/dri/i965/intel_debug.c
+++ b/src/mesa/drivers/dri/i965/intel_debug.c
@@ -66,7 +66,7 @@ static const struct dri_debug_control debug_control[] = {
    { "blorp",       DEBUG_BLORP },
    { "nodualobj",   DEBUG_NO_DUAL_OBJECT_GS },
    { "optimizer",   DEBUG_OPTIMIZER },
-   { "noann",       DEBUG_NO_ANNOTATION },
+   { "ann",         DEBUG_ANNOTATION },
    { "no8",         DEBUG_NO8 },
    { NULL,    0 }
 };

diff --git a/src/mesa/drivers/dri/i965/intel_debug.h b/src/mesa/drivers/dri/i965/intel_debug.h
index e693e9c600d1d44386073f60bda370282bab0186..df2c86345efa6d07c8136b66e85b7cd3364a6449 100644 (file)
--- a/src/mesa/drivers/dri/i965/intel_debug.h
+++ b/src/mesa/drivers/dri/i965/intel_debug.h
@@ -61,7 +61,7 @@ extern uint64_t INTEL_DEBUG;
 #define DEBUG_VUE                 (1 << 25)
 #define DEBUG_NO_DUAL_OBJECT_GS   (1 << 26)
 #define DEBUG_OPTIMIZER           (1 << 27)
-#define DEBUG_NO_ANNOTATION       (1 << 28)
+#define DEBUG_ANNOTATION          (1 << 28)
 #define DEBUG_NO8                 (1 << 29)
 
 #ifdef HAVE_ANDROID_PLATFORM