From: Topi Pohjolainen Date: Mon, 18 Apr 2016 15:43:40 +0000 (+0300) Subject: i965: Relax assertion of halign == 16 for lossless compressed aux X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=94926492d807b68187e34c670965986b1c88e0ac;p=mesa.git i965: Relax assertion of halign == 16 for lossless compressed aux Signed-off-by: Topi Pohjolainen Reviewed-by: Ben Widawsky --- diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c index 94f63333c14..1ead43fcc03 100644 --- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c +++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c @@ -556,8 +556,13 @@ intel_miptree_create_layout(struct brw_context *brw, } else if (brw->gen >= 9 && num_samples > 1) { layout_flags |= MIPTREE_LAYOUT_FORCE_HALIGN16; } else { + const 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((layout_flags & MIPTREE_LAYOUT_FORCE_HALIGN16) == 0); + assert(is_lossless_compressed_aux || + (layout_flags & MIPTREE_LAYOUT_FORCE_HALIGN16) == 0); } brw_miptree_layout(brw, mt, layout_flags);