<p dir="ltr">I'm good with it.</p>
<p dir="ltr">Reviewed-by: Jason Ekstrand <<a href="mailto:jason.ekstrand@intel.com">jason.ekstrand@intel.com</a>></p>
<div class="gmail_quote">On Dec 6, 2014 3:24 AM, "Kenneth Graunke" <<a href="mailto:kenneth@whitecape.org">kenneth@whitecape.org</a>> wrote:<br type="attribution"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">On Friday, December 05, 2014 05:08:40 PM Matt Turner wrote:<br>
> ---<br>
> Eric was against making this the default when I first suggested a flag.<br>
> Have opinions changed since then? I rarely use the annotations, and they<br>
> do make the assembly harder to read, when the assembly is what you're<br>
> interested in.<br>
><br>
>Â src/mesa/drivers/dri/i965/intel_asm_annotation.c | 2 +-<br>
> src/mesa/drivers/dri/i965/intel_debug.c     | 2 +-<br>
> src/mesa/drivers/dri/i965/intel_debug.h     | 2 +-<br>
>Â 3 files changed, 3 insertions(+), 3 deletions(-)<br>
><br>
> diff --git a/src/mesa/drivers/dri/i965/intel_asm_annotation.c b/src/mesa/drivers/dri/i965/intel_asm_annotation.c<br>
> index 37ad090..ac12655 100644<br>
> --- a/src/mesa/drivers/dri/i965/intel_asm_annotation.c<br>
> +++ b/src/mesa/drivers/dri/i965/intel_asm_annotation.c<br>
> @@ -109,7 +109,7 @@ void annotate(struct brw_context *brw,<br>
><br>
>Â Â Â struct annotation *ann = &annotation->ann[annotation->ann_count++];<br>
>Â Â Â ann->offset = offset;<br>
> -Â Â if ((INTEL_DEBUG & DEBUG_NO_ANNOTATION) == 0) {<br>
> +Â Â if ((INTEL_DEBUG & DEBUG_ANNOTATION) != 0) {<br>
>Â Â Â Â ann->ir = inst->ir;<br>
>Â Â Â Â ann->annotation = inst->annotation;<br>
>Â Â Â }<br>
> diff --git a/src/mesa/drivers/dri/i965/intel_debug.c b/src/mesa/drivers/dri/i965/intel_debug.c<br>
> index 6391cf7..1dd2b1d 100644<br>
> --- a/src/mesa/drivers/dri/i965/intel_debug.c<br>
> +++ b/src/mesa/drivers/dri/i965/intel_debug.c<br>
> @@ -66,7 +66,7 @@ static const struct dri_debug_control debug_control[] = {<br>
>   { "blorp",    DEBUG_BLORP },<br>
>   { "nodualobj",  DEBUG_NO_DUAL_OBJECT_GS },<br>
>   { "optimizer",  DEBUG_OPTIMIZER },<br>
> -  { "noann",    DEBUG_NO_ANNOTATION },<br>
> +  { "ann",     DEBUG_ANNOTATION },<br>
>   { "no8",     DEBUG_NO8 },<br>
>   { NULL,  0 }<br>
>Â };<br>
> diff --git a/src/mesa/drivers/dri/i965/intel_debug.h b/src/mesa/drivers/dri/i965/intel_debug.h<br>
> index e859be1..a01de21 100644<br>
> --- a/src/mesa/drivers/dri/i965/intel_debug.h<br>
> +++ b/src/mesa/drivers/dri/i965/intel_debug.h<br>
> @@ -61,7 +61,7 @@ extern uint64_t INTEL_DEBUG;<br>
>Â #define DEBUG_VUEÂ Â Â Â Â Â Â Â Â (1 << 25)<br>
>Â #define DEBUG_NO_DUAL_OBJECT_GSÂ Â (1 << 26)<br>
>Â #define DEBUG_OPTIMIZERÂ Â Â Â Â Â (1 << 27)<br>
> -#define DEBUG_NO_ANNOTATIONÂ Â Â Â (1 << 28)<br>
> +#define DEBUG_ANNOTATIONÂ Â Â Â Â (1 << 28)<br>
>Â #define DEBUG_NO8Â Â Â Â Â Â Â Â Â (1 << 29)<br>
><br>
>Â #ifdef HAVE_ANDROID_PLATFORM<br>
><br>
<br>
Sounds good to me.<br>
<br>
Reviewed-by: Kenneth Graunke <<a href="mailto:kenneth@whitecape.org">kenneth@whitecape.org</a>><br>_______________________________________________<br>
mesa-dev mailing list<br>
<a href="mailto:mesa-dev@lists.freedesktop.org">mesa-dev@lists.freedesktop.org</a><br>
<a href="http://lists.freedesktop.org/mailman/listinfo/mesa-dev" target="_blank">http://lists.freedesktop.org/mailman/listinfo/mesa-dev</a><br>
<br></blockquote></div>