diff options
| author | Andre Maasikas <amaasikas@gmail.com> | 2011-06-27 18:03:27 +0300 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2011-06-29 06:59:46 -0600 |
| commit | ee416c6ffe455046b866ef8b124a86f82113f5da (patch) | |
| tree | 110764db9e99cb38afd7e0fec6fa60e1ab814fa0 | |
| parent | ebc884d3dd1c67e7f2eaa8ea56815de446a1f8ec (diff) | |
st/mesa: fix overwriting gl_format with pipe_format since 9d380f48
fixes assert later on in texcompress2/r600g
Signed-off-by: Brian Paul <brianp@vmware.com>
(cherry picked from commit 19789e403ca3d0171d18f3c862738225902315e9)
| -rw-r--r-- | src/mesa/state_tracker/st_cb_texture.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c index d52e273514d..6907cfc03cf 100644 --- a/src/mesa/state_tracker/st_cb_texture.c +++ b/src/mesa/state_tracker/st_cb_texture.c @@ -842,7 +842,7 @@ decompress_with_blit(struct gl_context * ctx, GLenum target, GLint level, else { /* format translation via floats */ GLuint row; - enum pipe_format format = util_format_linear(dst_texture->format); + enum pipe_format pformat = util_format_linear(dst_texture->format); for (row = 0; row < height; row++) { const GLbitfield transferOps = 0x0; /* bypassed for glGetTexImage() */ GLfloat rgba[4 * MAX_WIDTH]; @@ -854,7 +854,7 @@ decompress_with_blit(struct gl_context * ctx, GLenum target, GLint level, /* get float[4] rgba row from surface */ pipe_get_tile_rgba_format(pipe, tex_xfer, 0, row, width, 1, - format, rgba); + pformat, rgba); _mesa_pack_rgba_span_float(ctx, width, (GLfloat (*)[4]) rgba, format, type, dest, &ctx->Pack, transferOps); |