Mesa (master): gallium/u_blit: check nr_samples before using resource_copy_region
Marek Olšák
mareko at kemper.freedesktop.org
Sat Aug 4 13:01:10 UTC 2012
Module: Mesa
Branch: master
Commit: 6b3f1ae12b7d53bf88cdcf0e78803e929cdf5bbd
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=6b3f1ae12b7d53bf88cdcf0e78803e929cdf5bbd
Author: Marek Olšák <maraeo at gmail.com>
Date: Tue Jul 24 16:10:45 2012 +0200
gallium/u_blit: check nr_samples before using resource_copy_region
Reviewed-by: Brian Paul <brianp at vmware.com>
---
src/gallium/auxiliary/util/u_blit.c | 3 ++-
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 5ad2984..1300872 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 &&
More information about the mesa-commit
mailing list