Mesa (master): anv/blorp: Turn off AUX after doing a CCS_D resolve

[Jason Ekstrand]

Module: Mesa
Branch: master
Commit: 273b720310863c2084c55f1371b2d27c2d96dbda
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=273b720310863c2084c55f1371b2d27c2d96dbda

Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date:   Thu Mar  9 16:37:23 2017 -0800

anv/blorp: Turn off AUX after doing a CCS_D resolve

For render passes with multiple subpasses on gen7, we only fast-clear at
the top but an input attachment use can cause us to do a resolve in the
middle of the render pass.  Once we've done so, we are no longer have a
fast-cleared surface so we can just set aux_usage to NONE.

Reviewed-by: Topi Pohjolainen <topi.pohjolainen at intel.com>
Cc: "17.0" <mesa-stable at lists.freedesktop.org>

---

 src/intel/vulkan/anv_blorp.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/intel/vulkan/anv_blorp.c b/src/intel/vulkan/anv_blorp.c
index 8de339c..2bab0d0 100644
--- a/src/intel/vulkan/anv_blorp.c
+++ b/src/intel/vulkan/anv_blorp.c
@@ -1537,6 +1537,8 @@ ccs_resolve_attachment(struct anv_cmd_buffer *cmd_buffer,
 
    /* Once we've done any sort of resolve, we're no longer fast-cleared */
    att_state->fast_clear = false;
+   if (att_state->aux_usage == ISL_AUX_USAGE_CCS_D)
+      att_state->aux_usage = ISL_AUX_USAGE_NONE;
 }
 
 void