projects
/
platform
/
upstream
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e768930
)
gallium/u_blit: check nr_samples before using resource_copy_region
author
Marek Olšák
<maraeo@gmail.com>
Tue, 24 Jul 2012 14:10:45 +0000
(16:10 +0200)
committer
Marek 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
patch
|
blob
|
history
diff --git
a/src/gallium/auxiliary/util/u_blit.c
b/src/gallium/auxiliary/util/u_blit.c
index
5ad2984
..
1300872
100644
(file)
--- 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 &&