From: Marek Olšák <maraeo@gmail.com>
Date: Tue, 24 Jul 2012 14:10:45 +0000 (+0200)
Subject: gallium/u_blit: check nr_samples before using resource_copy_region
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6b3f1ae12b7d53bf88cdcf0e78803e929cdf5bbd;p=mesa.git

gallium/u_blit: check nr_samples before using resource_copy_region

Reviewed-by: Brian Paul <brianp@vmware.com>
---

diff --git a/src/gallium/auxiliary/util/u_blit.c b/src/gallium/auxiliary/util/u_blit.c
index 5ad2984b730..1300872b043 100644
--- a/src/gallium/auxiliary/util/u_blit.c
+++ b/src/gallium/auxiliary/util/u_blit.c
@@ -478,10 +478,11 @@ util_blit_pixels(struct blit_state *ctx,
 
    /*
     * Check for simple case:  no format conversion, no flipping, no stretching,
-    * no overlapping.
+    * no overlapping, same number of samples.
     * Filter mode should not matter since there's no stretching.
     */
    if (formats_compatible(src_format, dst_format) &&
+       src_tex->nr_samples == dst->texture->nr_samples &&
        is_stencil == blit_stencil &&
        is_depth == blit_depth &&
        srcX0 < srcX1 &&