From: Nanley Chery <nanley.g.chery@intel.com>
Date: Wed, 21 Aug 2019 23:43:26 +0000 (-0700)
Subject: intel/blorp: Assert against HiZ in surface states
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=cc415f911f7bbba683e4724af4ab58d8cc9523ca;p=mesa.git

intel/blorp: Assert against HiZ in surface states

Avoid unexpected behavior if the caller happens to pass in a HiZ aux
usage.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
---

diff --git a/src/intel/blorp/blorp_genX_exec.h b/src/intel/blorp/blorp_genX_exec.h
index f47372f9f06..cb2d2536899 100644
--- a/src/intel/blorp/blorp_genX_exec.h
+++ b/src/intel/blorp/blorp_genX_exec.h
@@ -1356,9 +1356,8 @@ blorp_emit_surface_state(struct blorp_batch *batch,
    }
 
    /* Blorp doesn't support HiZ in any of the blit or slow-clear paths */
+   assert(surface->aux_usage != ISL_AUX_USAGE_HIZ);
    enum isl_aux_usage aux_usage = surface->aux_usage;
-   if (aux_usage == ISL_AUX_USAGE_HIZ)
-      aux_usage = ISL_AUX_USAGE_NONE;
 
    isl_channel_mask_t write_disable_mask = 0;
    if (is_render_target && GEN_GEN <= 5) {