Reviewed-by: Jason Ekstrand <jason.ekstr...@intel.com>
On Mon, Sep 15, 2014 at 11:28 PM, Dave Airlie <airl...@gmail.com> wrote:
> From: Richard Sandiford <rsand...@linux.vnet.ibm.com>
>
> MESA_FORMAT_R8G8B8X8_SNORM used a function called unpack_X8B8G8R8_SNORM
> while MESA_FORMAT_R8G8B8X8_SRGB used a function called
> unpack_R8G8B8X8_SRGB.
> This patch renames the SNORM function to have the same order as the
> MESA_FORMAT name, like the SRGB function does.
>
> Signed-off-by: Richard Sandiford <rsand...@linux.vnet.ibm.com>
> Signed-off-by: Dave Airlie <airl...@redhat.com>
> ---
> src/mesa/main/format_unpack.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/src/mesa/main/format_unpack.c b/src/mesa/main/format_unpack.c
> index eed92d8..68fbcb3 100644
> --- a/src/mesa/main/format_unpack.c
> +++ b/src/mesa/main/format_unpack.c
> @@ -2106,7 +2106,7 @@ unpack_XRGB1555_UNORM(const void *src, GLfloat
> dst[][4], GLuint n)
> }
>
> static void
> -unpack_XBGR8888_SNORM(const void *src, GLfloat dst[][4], GLuint n)
> +unpack_R8G8B8X8_SNORM(const void *src, GLfloat dst[][4], GLuint n)
> {
> const GLuint *s = ((const GLuint *) src);
> GLuint i;
> @@ -2526,7 +2526,7 @@ get_unpack_rgba_function(mesa_format format)
>
> table[MESA_FORMAT_B4G4R4X4_UNORM] = unpack_XRGB4444_UNORM;
> table[MESA_FORMAT_B5G5R5X1_UNORM] = unpack_XRGB1555_UNORM;
> - table[MESA_FORMAT_R8G8B8X8_SNORM] = unpack_XBGR8888_SNORM;
> + table[MESA_FORMAT_R8G8B8X8_SNORM] = unpack_R8G8B8X8_SNORM;
> table[MESA_FORMAT_R8G8B8X8_SRGB] = unpack_R8G8B8X8_SRGB;
> table[MESA_FORMAT_RGBX_UINT8] = unpack_XBGR8888_UINT;
> table[MESA_FORMAT_RGBX_SINT8] = unpack_XBGR8888_SINT;
> --
> 1.9.3
>
> _______________________________________________
> 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
