intel/blorp: Assert against HiZ in surface states
authorNanley Chery <nanley.g.chery@intel.com>
Wed, 21 Aug 2019 23:43:26 +0000 (16:43 -0700)
committerNanley Chery <nanley.g.chery@intel.com>
Mon, 28 Oct 2019 17:47:05 +0000 (10:47 -0700)
Avoid unexpected behavior if the caller happens to pass in a HiZ aux
usage.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
src/intel/blorp/blorp_genX_exec.h

index f47372f9f061667042db550f788424702ec2eb36..cb2d2536899c5b7abb5510b0ad5b90d6d807cbdb 100644 (file)
@@ -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) {