Both patches seem good to me.
Jose
----- Original Message -----
> st_equal_formats() is no longer used now.
> ---
> src/mesa/state_tracker/st_cb_texture.c | 4 +++-
> 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 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);
> --
> 1.7.3.4
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev
>
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
