st/mesa: restore the stObj's size if it was cleared out

An issue could still occur if the base level is set, but fixing that
would require a lot more logic.

This fixes the recently-failing texelFetch 3D tests because the mipmaps
were no longer being generated, which in turn caused the copying logic
to be hit, which in turn didn't work because of the broken
width/height/depth.

Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
This commit is contained in:
Ilia Mirkin 2016-01-17 16:25:00 -05:00
parent 805e080ba0
commit af686e7de3
1 changed files with 6 additions and 0 deletions

View File

@ -1670,6 +1670,12 @@ st_finalize_texture(struct gl_context *ctx,
width = stObj->width0;
height = stObj->height0;
depth = stObj->depth0;
} else {
/* The width/height/depth may have been previously reset in
* guess_and_alloc_texture. */
stObj->width0 = width;
stObj->height0 = height;
stObj->depth0 = depth;
}
/* convert GL dims to Gallium dims */
st_gl_texture_dims_to_pipe_dims(stObj->base.Target, width, height, depth,