summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Widawsky <ben@bwidawsk.net>2017-01-05 21:19:35 -0800
committerBen Widawsky <ben@bwidawsk.net>2017-03-28 14:26:09 -0700
commit369f010e206ca6e45d0652126b66c8015f69923f (patch)
tree5708984c5d12c7a42670cfce5c1b3fdd1de5a520
parentad3d08710f69b9012f17472301425dbdcfec8503 (diff)
i965/miptree: Remove dead code assertion
We no longer allocate a miptree for the mcs_buf, so this is not a useful assertion. While here, move the CCS disabling so that we only conditionally shut it off. This helps us dtrt later when CCS is used in more places. Recommended-by: Topi Pohjolainen <topi.pohjolainen@intel.com> Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
-rw-r--r--src/mesa/drivers/dri/i965/intel_mipmap_tree.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
index 8e5cd8ed30..ccf20c6b3b 100644
--- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
+++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
@@ -521,14 +521,6 @@ intel_miptree_create_layout(struct brw_context *brw,
layout_flags |= MIPTREE_LAYOUT_FORCE_HALIGN16;
} else {
mt->aux_disable |= INTEL_AUX_DISABLE_CCS;
-
- const UNUSED bool is_lossless_compressed_aux =
- brw->gen >= 9 && num_samples == 1 &&
- mt->format == MESA_FORMAT_R_UINT32;
-
- /* For now, nothing else has this requirement */
- assert(is_lossless_compressed_aux ||
- (layout_flags & MIPTREE_LAYOUT_FORCE_HALIGN16) == 0);
}
if (!brw_miptree_layout(brw, mt, layout_flags)) {