From 47aaabda4771524755c9b3246d967afeb300a3ca Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Thu, 13 Nov 2014 10:40:01 -0800 Subject: [PATCH] i965: Replace 'noann' debug flag with 'ann'. Reviewed-by: Ben Widawsky Reviewed-by: Kenneth Graunke Reviewed-by: Jason Ekstrand --- src/mesa/drivers/dri/i965/intel_asm_annotation.c | 2 +- src/mesa/drivers/dri/i965/intel_debug.c | 2 +- src/mesa/drivers/dri/i965/intel_debug.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mesa/drivers/dri/i965/intel_asm_annotation.c b/src/mesa/drivers/dri/i965/intel_asm_annotation.c index 37ad09095f5..ac126556107 100644 --- 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 6391cf74ab6..1dd2b1db4b8 100644 --- 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 e693e9c600d..df2c86345ef 100644 --- 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 -- 2.30.2