[Mesa-stable] [Mesa-dev] [PATCH 2/2] radeonsi: Do colorformat endian swap for PIPE_USAGE_STAGING

[Marek Olšák]

Reviewed-by: Marek Olšák <marek.olsak at amd.com>

Marek

On Wed, Mar 2, 2016 at 8:22 PM, Oded Gabbay <oded.gabbay at gmail.com> wrote:
> There is an old if statement (dated to 2011) that prevented doing
> endian swap for colorformat, in case the buffer is marked as
> PIPE_USAGE_STAGING.
>
> This is now wrong because st_ReadPixels() reads into a destination
> texture that is marked with PIPE_USAGE_STAGING. Therefore, even if
> the texture is rendered correctly to the monitor, when reading it
> back we get unswapped/wrong values.
>
> This patch makes the check_rgba() function in gl-1.0-readpixsanity
> piglit test pass in big-endian.
>
> Signed-off-by: Oded Gabbay <oded.gabbay at gmail.com>
> Cc: "11.1 11.2" <mesa-stable at lists.freedesktop.org>
> ---
>  src/gallium/drivers/radeonsi/si_state.c | 6 +-----
>  1 file changed, 1 insertion(+), 5 deletions(-)
>
> diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c
> index b23b17a..15732a6 100644
> --- a/src/gallium/drivers/radeonsi/si_state.c
> +++ b/src/gallium/drivers/radeonsi/si_state.c
> @@ -2250,11 +2250,7 @@ static void si_initialize_color_surface(struct si_context *sctx,
>         }
>         assert(format != V_028C70_COLOR_INVALID);
>         swap = r600_translate_colorswap(surf->base.format);
> -       if (rtex->resource.b.b.usage == PIPE_USAGE_STAGING) {
> -               endian = V_028C70_ENDIAN_NONE;
> -       } else {
> -               endian = si_colorformat_endian_swap(format);
> -       }
> +       endian = si_colorformat_endian_swap(format);
>
>         /* blend clamp should be set for all NORM/SRGB types */
>         if (ntype == V_028C70_NUMBER_UNORM ||
> --
> 2.5.0
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev