summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorTopi Pohjolainen <[email protected]>2016-11-22 21:53:38 +0200
committerTopi Pohjolainen <[email protected]>2016-11-25 16:57:07 +0200
commit3aec6bce5b4a3604b55dcdbccf90b35c71507959 (patch)
treee00e55cc8083ec4552462c3de7ede1b0333b7c2c /src/mesa
parent17d7c5a0372f3fd9a2a8f9f79ca891215f51c474 (diff)
i965: Allow single-sampled miptree to be resolved and shared
Signed-off-by: Topi Pohjolainen <[email protected]> Reviewed-by: Jason Ekstrand <[email protected]>
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/drivers/dri/i965/intel_mipmap_tree.c2
1 files changed, 1 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 20ca3657c92..2c4cc087923 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);