gallium/u_blit: check nr_samples before using resource_copy_region
authorMarek Olšák <maraeo@gmail.com>
Tue, 24 Jul 2012 14:10:45 +0000 (16:10 +0200)
committerMarek Olšák <maraeo@gmail.com>
Sat, 4 Aug 2012 11:53:07 +0000 (13:53 +0200)
Reviewed-by: Brian Paul <brianp@vmware.com>
src/gallium/auxiliary/util/u_blit.c

index 5ad2984b730e7c4cc049b32cfee415aa031c3e32..1300872b043029d5a48fafafae9ffb48ca40679e 100644 (file)
@@ -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 &&