summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorTopi Pohjolainen <[email protected]>2016-04-18 18:43:40 +0300
committerTopi Pohjolainen <[email protected]>2016-05-12 19:49:22 +0300
commit94926492d807b68187e34c670965986b1c88e0ac (patch)
treec60b6e021e3d9aa62cfd8e69521d881f9e597987 /src/mesa
parentba9f954e603a1976125e9fdccc35e32ac947c8fd (diff)
i965: Relax assertion of halign == 16 for lossless compressed aux
Signed-off-by: Topi Pohjolainen <[email protected]> Reviewed-by: Ben Widawsky <[email protected]>
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/drivers/dri/i965/intel_mipmap_tree.c7
1 files changed, 6 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 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);