Mesa (17.3): i965/draw: Set NEW_AUX_STATE when draw aux changes

[Emil Velikov]

Module: Mesa
Branch: 17.3
Commit: c0abad571dfcd864f0fd38d0040597bdceb5a608
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c0abad571dfcd864f0fd38d0040597bdceb5a608

Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date:   Tue Jan 23 23:47:26 2018 -0800

i965/draw: Set NEW_AUX_STATE when draw aux changes

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104411
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104383
Fixes: ea0d2e98ecb369ab84e78c84709c0930ea8c293a
Cc: mesa-stable at lists.freedesktop.org
Reviewed-by: Topi Pohjolainen <topi.pohjolainen at intel.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
(cherry picked from commit 20f70ae3858bc213e052a8434f0e637eb36203c4)

---

 src/mesa/drivers/dri/i965/brw_draw.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/mesa/drivers/dri/i965/brw_draw.c b/src/mesa/drivers/dri/i965/brw_draw.c
index 9def44cc45..a22c3c6ae6 100644
--- a/src/mesa/drivers/dri/i965/brw_draw.c
+++ b/src/mesa/drivers/dri/i965/brw_draw.c
@@ -557,7 +557,10 @@ brw_predraw_resolve_framebuffer(struct brw_context *brw,
          intel_miptree_render_aux_usage(brw, irb->mt, isl_format,
                                         blend_enabled,
                                         draw_aux_buffer_disabled[i]);
-      brw->draw_aux_usage[i] = aux_usage;
+      if (brw->draw_aux_usage[i] != aux_usage) {
+         brw->ctx.NewDriverState |= BRW_NEW_AUX_STATE;
+         brw->draw_aux_usage[i] = aux_usage;
+      }
 
       intel_miptree_prepare_render(brw, irb->mt, irb->mt_level,
                                    irb->mt_layer, irb->layer_count,