summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeith Whitwell <keithw@vmware.com>2009-04-27 14:42:23 +0100
committerKeith Whitwell <keithw@vmware.com>2009-04-27 14:43:57 +0100
commit5ed7764fd6354da8e2be15d6fb724c2d6be9be4a (patch)
treeed89c7b4d2706e37dd215e91d99568a85f18ed52
parente32660060954c0d1a1f7636c6365970348f3be24 (diff)
mesa/st: fix incorrect face, level in compress_with_blit
We were incorrectly applying the destination texture face and level when requesting a transfer to the temporary texture, which has only one face and level. This would obviously cause problems uploading to compressed cube and mipmap textures.
-rw-r--r--src/mesa/state_tracker/st_cb_texture.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c
index c3e990e0775..aeb75117ec3 100644
--- a/src/mesa/state_tracker/st_cb_texture.c
+++ b/src/mesa/state_tracker/st_cb_texture.c
@@ -418,7 +418,6 @@ compress_with_blit(GLcontext * ctx,
const GLuint dstImageOffsets[1] = {0};
struct st_texture_image *stImage = st_texture_image(texImage);
struct pipe_screen *screen = ctx->st->pipe->screen;
- const GLuint face = _mesa_tex_target_to_face(target);
const struct gl_texture_format *mesa_format;
struct pipe_texture templ;
struct pipe_texture *src_tex;
@@ -467,7 +466,7 @@ compress_with_blit(GLcontext * ctx,
/* Put user's tex data into the temporary texture
*/
tex_xfer = st_cond_flush_get_tex_transfer(st_context(ctx), src_tex,
- face, level, 0,
+ 0, 0, 0, /* face, level are zero */
PIPE_TRANSFER_WRITE,
0, 0, width, height); /* x, y, w, h */
map = screen->transfer_map(screen, tex_xfer);