[Mesa-dev] [PATCH 11/11] st/mesa: Fix handling of 8888 SNORM and SRGB formats for big-endian

[Ilia Mirkin]

Do you also need to extend DEFAULT_SNORM8_RGBA_FORMATS in st_format.c
to include your new SNORM format? (And update a whole bunch of the
format_map to use that macro.)

On Tue, Sep 16, 2014 at 2:28 AM, Dave Airlie <airlied at gmail.com> wrote:
> From: Richard Sandiford <rsandifo at linux.vnet.ibm.com>
>
> MESA_FORMAT_x8y8z8w8 puts the x channel in the least significant part of
> the containing 32-bit integer, which is equivalent to PIPE_FORMAT_xyzw8888.
> PIPE_FORMAT_x8y8z8w8 puts the x channel first in memory.
>
> This patch fixes up the mesa<->gallium mapping accordingly.
>
> Signed-off-by: Richard Sandiford <rsandifo at linux.vnet.ibm.com>
> Signed-off-by: Dave Airlie <airlied at redhat.com>
> ---
>  src/mesa/state_tracker/st_format.c | 50 ++++++++++++++++++++++++++------------
>  1 file changed, 35 insertions(+), 15 deletions(-)
>
> diff --git a/src/mesa/state_tracker/st_format.c b/src/mesa/state_tracker/st_format.c
> index 6caedfc..37acab6 100644
> --- a/src/mesa/state_tracker/st_format.c
> +++ b/src/mesa/state_tracker/st_format.c
> @@ -154,11 +154,13 @@ st_mesa_format_to_pipe_format(struct st_context *st, mesa_format mesaFormat)
>     case MESA_FORMAT_BGR_SRGB8:
>        return PIPE_FORMAT_R8G8B8_SRGB;
>     case MESA_FORMAT_A8B8G8R8_SRGB:
> -      return PIPE_FORMAT_A8B8G8R8_SRGB;
> -   case MESA_FORMAT_B8G8R8A8_SRGB:
> -      return PIPE_FORMAT_B8G8R8A8_SRGB;
> +      return PIPE_FORMAT_ABGR8888_SRGB;
>     case MESA_FORMAT_R8G8B8A8_SRGB:
> -      return PIPE_FORMAT_R8G8B8A8_SRGB;
> +      return PIPE_FORMAT_RGBA8888_SRGB;
> +   case MESA_FORMAT_B8G8R8A8_SRGB:
> +      return PIPE_FORMAT_BGRA8888_SRGB;
> +   case MESA_FORMAT_A8R8G8B8_SRGB:
> +      return PIPE_FORMAT_ARGB8888_SRGB;
>     case MESA_FORMAT_RGBA_FLOAT32:
>        return PIPE_FORMAT_R32G32B32A32_FLOAT;
>     case MESA_FORMAT_RGBA_FLOAT16:
> @@ -355,7 +357,9 @@ st_mesa_format_to_pipe_format(struct st_context *st, mesa_format mesaFormat)
>     case MESA_FORMAT_G8R8_SNORM:
>        return PIPE_FORMAT_GR88_SNORM;
>     case MESA_FORMAT_R8G8B8A8_SNORM:
> -      return PIPE_FORMAT_R8G8B8A8_SNORM;
> +      return PIPE_FORMAT_RGBA8888_SNORM;
> +   case MESA_FORMAT_A8B8G8R8_SNORM:
> +      return PIPE_FORMAT_ABGR8888_SNORM;
>
>     case MESA_FORMAT_A_SNORM8:
>        return PIPE_FORMAT_A8_SNORM;
> @@ -400,9 +404,13 @@ st_mesa_format_to_pipe_format(struct st_context *st, mesa_format mesaFormat)
>     case MESA_FORMAT_B5G5R5X1_UNORM:
>        return PIPE_FORMAT_B5G5R5X1_UNORM;
>     case MESA_FORMAT_R8G8B8X8_SNORM:
> -      return PIPE_FORMAT_R8G8B8X8_SNORM;
> +      return PIPE_FORMAT_RGBX8888_SNORM;
> +   case MESA_FORMAT_X8B8G8R8_SNORM:
> +      return PIPE_FORMAT_XBGR8888_SNORM;
>     case MESA_FORMAT_R8G8B8X8_SRGB:
> -      return PIPE_FORMAT_R8G8B8X8_SRGB;
> +      return PIPE_FORMAT_RGBX8888_SRGB;
> +   case MESA_FORMAT_X8B8G8R8_SRGB:
> +      return PIPE_FORMAT_XBGR8888_SRGB;
>     case MESA_FORMAT_RGBX_UINT8:
>        return PIPE_FORMAT_R8G8B8X8_UINT;
>     case MESA_FORMAT_RGBX_SINT8:
> @@ -428,6 +436,8 @@ st_mesa_format_to_pipe_format(struct st_context *st, mesa_format mesaFormat)
>
>     case MESA_FORMAT_B8G8R8X8_SRGB:
>        return PIPE_FORMAT_B8G8R8X8_SRGB;
> +   case MESA_FORMAT_X8R8G8B8_SRGB:
> +      return PIPE_FORMAT_XRGB8888_SRGB;
>
>     /* ETC2 formats are emulated as uncompressed ones.
>      * The destination formats mustn't be changed, because they are also
> @@ -564,10 +574,14 @@ st_pipe_format_to_mesa_format(enum pipe_format format)
>        return MESA_FORMAT_L_SRGB8;
>     case PIPE_FORMAT_R8G8B8_SRGB:
>        return MESA_FORMAT_BGR_SRGB8;
> -   case PIPE_FORMAT_A8B8G8R8_SRGB:
> +   case PIPE_FORMAT_ABGR8888_SRGB:
>        return MESA_FORMAT_A8B8G8R8_SRGB;
> -   case PIPE_FORMAT_B8G8R8A8_SRGB:
> +   case PIPE_FORMAT_RGBA8888_SRGB:
> +      return MESA_FORMAT_R8G8B8A8_SRGB;
> +   case PIPE_FORMAT_BGRA8888_SRGB:
>        return MESA_FORMAT_B8G8R8A8_SRGB;
> +   case PIPE_FORMAT_ARGB8888_SRGB:
> +      return MESA_FORMAT_A8R8G8B8_SRGB;
>     case PIPE_FORMAT_R32G32B32A32_FLOAT:
>        return MESA_FORMAT_RGBA_FLOAT32;
>     case PIPE_FORMAT_R16G16B16A16_FLOAT:
> @@ -758,8 +772,10 @@ st_pipe_format_to_mesa_format(enum pipe_format format)
>        return MESA_FORMAT_R8G8_SNORM;
>     case PIPE_FORMAT_GR88_SNORM:
>        return MESA_FORMAT_G8R8_SNORM;
> -   case PIPE_FORMAT_R8G8B8A8_SNORM:
> +   case PIPE_FORMAT_RGBA8888_SNORM:
>        return MESA_FORMAT_R8G8B8A8_SNORM;
> +   case PIPE_FORMAT_ABGR8888_SNORM:
> +      return MESA_FORMAT_A8B8G8R8_SNORM;
>
>     case PIPE_FORMAT_A8_SNORM:
>        return MESA_FORMAT_A_SNORM8;
> @@ -804,10 +820,14 @@ st_pipe_format_to_mesa_format(enum pipe_format format)
>        return MESA_FORMAT_B4G4R4X4_UNORM;
>     case PIPE_FORMAT_B5G5R5X1_UNORM:
>        return MESA_FORMAT_B5G5R5X1_UNORM;
> -   case PIPE_FORMAT_R8G8B8X8_SNORM:
> +   case PIPE_FORMAT_RGBX8888_SNORM:
>        return MESA_FORMAT_R8G8B8X8_SNORM;
> -   case PIPE_FORMAT_R8G8B8X8_SRGB:
> +   case PIPE_FORMAT_XBGR8888_SNORM:
> +      return MESA_FORMAT_X8B8G8R8_SNORM;
> +   case PIPE_FORMAT_RGBX8888_SRGB:
>        return MESA_FORMAT_R8G8B8X8_SRGB;
> +   case PIPE_FORMAT_XBGR8888_SRGB:
> +      return MESA_FORMAT_X8B8G8R8_SRGB;
>     case PIPE_FORMAT_R8G8B8X8_UINT:
>        return MESA_FORMAT_RGBX_UINT8;
>     case PIPE_FORMAT_R8G8B8X8_SINT:
> @@ -831,10 +851,10 @@ st_pipe_format_to_mesa_format(enum pipe_format format)
>     case PIPE_FORMAT_R32G32B32X32_SINT:
>        return MESA_FORMAT_RGBX_SINT32;
>
> -   case PIPE_FORMAT_B8G8R8X8_SRGB:
> +   case PIPE_FORMAT_BGRX8888_SRGB:
>        return MESA_FORMAT_B8G8R8X8_SRGB;
> -   case PIPE_FORMAT_R8G8B8A8_SRGB:
> -      return MESA_FORMAT_R8G8B8A8_SRGB;
> +   case PIPE_FORMAT_XRGB8888_SRGB:
> +      return MESA_FORMAT_X8R8G8B8_SRGB;
>
>     default:
>        return MESA_FORMAT_NONE;
> --
> 1.9.3
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev