summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/mesa/drivers/dri/i965/intel_mipmap_tree.c12
1 files changed, 11 insertions, 1 deletions
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
@@ -213,6 +213,15 @@ intel_miptree_supports_ccs(struct brw_context *brw,
}
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;
}