Mesa (master): i965: Allow single-sampled miptree to be resolved and shared

[Topi Pohjolainen]

Module: Mesa
Branch: master
Commit: 3aec6bce5b4a3604b55dcdbccf90b35c71507959
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3aec6bce5b4a3604b55dcdbccf90b35c71507959

Author: Topi Pohjolainen <topi.pohjolainen at intel.com>
Date:   Tue Nov 22 21:53:38 2016 +0200

i965: Allow single-sampled miptree to be resolved and shared

Signed-off-by: Topi Pohjolainen <topi.pohjolainen at intel.com>
Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>

---

 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 20ca365..2c4cc08 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);