On 12/05/2014 05:23 PM, Ben Widawsky wrote:
> On Fri, Dec 05, 2014 at 05:08:40PM -0800, Matt Turner wrote:
>> ---
>> Eric was against making this the default when I first suggested a flag.
>> Have opinions changed since then? I rarely use the annotations, and they
>> do make the assembly harder to read, when the assembly is what you're
>> interested in.
>>
>> 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 37ad090..ac12655 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) {
>
> if (INTEL_DEBUG & DEBUG_ANNOTATION)
Doesn't this result in a GCC warning?
>> 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 6391cf7..1dd2b1d 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 e859be1..a01de21 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
>
> I never had an opinion, but I completely agree. With or without my suggestion
> above:
> Reviewed-by: Ben Widawsky <b...@bwidawsk.net>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev
>
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
