fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 03:08:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

st/mesa: Convert size assertions to conditionals in st_texture_image_copy.

Browse source 
Prevents potential assertion failures in piglit fbo-incomplete-texture-03 test.

NOTE: This is a candidate for the 7.11 branch.
This commit is contained in:
Brian Paul 2011-09-22 17:01:18 +02:00 • committed by Michel Dänzer
parent 0cf1a55568
commit 4beb8f9e9d
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/mesa/state_tracker/st_texture.c
View file

@ -366,9 +366,15 @@ st_texture_image_copy(struct pipe_context *pipe,
struct pipe_box src_box;
GLuint i;
assert(u_minify(src->width0, srcLevel) == width);
assert(u_minify(src->height0, srcLevel) == height);
assert(u_minify(src->depth0, srcLevel) == depth);
if (u_minify(src->width0, srcLevel) != width ||
u_minify(src->height0, srcLevel) != height ||
u_minify(src->depth0, srcLevel) != depth) {
/* The source image size doesn't match the destination image size.
* This can happen in some degenerate situations such as rendering to a
* cube map face which was set up with mismatched texture sizes.
*/
return;
}
src_box.x = 0;
src_box.y = 0;