[Mesa-dev] [PATCH v15 14/16] i965/miptree: Remove dead code assertion

Daniel Stone daniels at collabora.com
Tue Jun 6 17:20:22 UTC 2017


From: Ben Widawsky <ben at bwidawsk.net>

We no longer allocate a miptree for the mcs_buf, so this is not a useful
assertion.

Recommended-by: Topi Pohjolainen <topi.pohjolainen at intel.com>
Signed-off-by: Ben Widawsky <ben at bwidawsk.net>
Reviewed-by: Topi Pohjolainen <topi.pohjolainen at intel.com>
Signed-off-by: Daniel Stone <daniels at collabora.com>
---
 src/mesa/drivers/dri/i965/intel_mipmap_tree.c | 8 --------
 1 file changed, 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 79429a8c86..fe8aedcd10 100644
--- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
+++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
@@ -522,14 +522,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)) {
-- 
2.13.0



More information about the mesa-dev mailing list