From: Brian Paul <brianp@vmware.com>
Date: Tue, 14 Feb 2012 15:46:03 +0000 (-0700)
Subject: st/mesa: use _mesa_format_matches_format_and_type() in decompress_with_blit()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c9d0526084e87799f11bdb7322f257b88f1033c4;p=mesa.git

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 <jfonseca@vmware.com>
---

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);