summaryrefslogtreecommitdiffstats
path: root/src/gallium/auxiliary/util
diff options
context:
space:
mode:
authorMarek Olšák <[email protected]>2012-07-24 16:10:45 +0200
committerMarek Olšák <[email protected]>2012-08-04 13:53:07 +0200
commit6b3f1ae12b7d53bf88cdcf0e78803e929cdf5bbd (patch)
treed8eed57218a28ea971c570c7e6c186f6efc321a3 /src/gallium/auxiliary/util
parente7689303a8e4790c38cc69ae7a197712f98e8f5b (diff)
gallium/u_blit: check nr_samples before using resource_copy_region
Reviewed-by: Brian Paul <[email protected]>
Diffstat (limited to 'src/gallium/auxiliary/util')
-rw-r--r--src/gallium/auxiliary/util/u_blit.c3
1 files changed, 2 insertions, 1 deletions
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 &&