From 138316cc995182b0a3cd72e4ec06b67651a99a2c Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Mon, 17 Jul 2017 08:01:34 -0700 Subject: [PATCH] i965/miptree: Add an intel_tiling_supports_hiz helper We need this split for the same reason that we need the split for CCS: intel_miptree_supports_hiz is called *before* we choose the actual tiling. Adding a tiling_supports_hiz helper lets choose_aux_usage more accurately decide whether or not to enable hiz. In particular, this prevents us from enabling HiZ on linear depth buffers. Reviewed-by: Topi Pohjolainen --- src/mesa/drivers/dri/i965/intel_mipmap_tree.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c index cf5a6c056c1..8b7a3427c9d 100644 --- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c +++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c @@ -212,6 +212,15 @@ intel_miptree_supports_ccs(struct brw_context *brw, return true; } +static bool +intel_tiling_supports_hiz(const struct brw_context *brw, unsigned tiling) +{ + if (brw->gen < 6) + return false; + + return tiling == I915_TILING_Y; +} + static bool intel_miptree_supports_hiz(struct brw_context *brw, struct intel_mipmap_tree *mt) @@ -597,7 +606,8 @@ intel_miptree_choose_aux_usage(struct brw_context *brw, } else { mt->aux_usage = ISL_AUX_USAGE_CCS_D; } - } else if (intel_miptree_supports_hiz(brw, mt)) { + } else if (intel_tiling_supports_hiz(brw, mt->tiling) && + intel_miptree_supports_hiz(brw, mt)) { mt->aux_usage = ISL_AUX_USAGE_HIZ; } -- 2.30.2