summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2012-02-14 08:46:03 -0700
committerBrian Paul <[email protected]>2012-02-15 14:09:01 -0700
commitc9d0526084e87799f11bdb7322f257b88f1033c4 (patch)
treeeb3d9dbc12564ecf9223f1a400d21721ef7c5937
parentb549fd138eab508c5e942ec1807a9bac7e6af56f (diff)
st/mesa: use _mesa_format_matches_format_and_type() in decompress_with_blit()
st_equal_formats() is no longer used now. Reviewed-by: Jose Fonseca <[email protected]>
-rw-r--r--src/mesa/state_tracker/st_cb_texture.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c
index d66791e71e0..74ae2d11db6 100644
--- a/src/mesa/state_tracker/st_cb_texture.c
+++ b/src/mesa/state_tracker/st_cb_texture.c
@@ -673,7 +673,9 @@ decompress_with_blit(struct gl_context * ctx,
pixels = _mesa_map_pbo_dest(ctx, &ctx->Pack, pixels);
/* copy/pack data into user buffer */
- if (st_equal_formats(stImage->pt->format, format, type)) {
+ if (_mesa_format_matches_format_and_type(stImage->base.TexFormat,
+ format, type,
+ ctx->Pack.SwapBytes)) {
/* memcpy */
const uint bytesPerRow = width * util_format_get_blocksize(stImage->pt->format);
ubyte *map = pipe_transfer_map(pipe, tex_xfer);