From c9d0526084e87799f11bdb7322f257b88f1033c4 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Tue, 14 Feb 2012 08:46:03 -0700 Subject: [PATCH] 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 --- src/mesa/state_tracker/st_cb_texture.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c index d66791e..74ae2d1 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); -- 2.7.4