From 3aec6bce5b4a3604b55dcdbccf90b35c71507959 Mon Sep 17 00:00:00 2001 From: Topi Pohjolainen Date: Tue, 22 Nov 2016 21:53:38 +0200 Subject: i965: Allow single-sampled miptree to be resolved and shared Signed-off-by: Topi Pohjolainen Reviewed-by: Jason Ekstrand --- src/mesa/drivers/dri/i965/intel_mipmap_tree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c index 20ca3657c9..2c4cc08792 100644 --- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c +++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c @@ -2336,7 +2336,7 @@ intel_miptree_make_shareable(struct brw_context *brw, * pixel data is stored. Fortunately this code path should never be * reached for multisample buffers. */ - assert(mt->msaa_layout == INTEL_MSAA_LAYOUT_NONE); + assert(mt->msaa_layout == INTEL_MSAA_LAYOUT_NONE || mt->num_samples <= 1); if (mt->mcs_buf) { intel_miptree_all_slices_resolve_color(brw, mt, 0); -- cgit v1.2.3