[PATCH] Complete ARGB8888 naming convention format renames missed by 58dc1b28d1ef4d1931c52b079d304f2e1546329d

[Kristian Høgsberg]

On Tue, Jan 17, 2012 at 4:54 AM, Scott Moreau <oreaus at gmail.com> wrote:
> Looks like a few renames were missed in
> 58dc1b28d1ef4d1931c52b079d304f2e1546329d as mesa failed to build with:

Oops.  Thanks, pushed.

> wayland/native_shm.c: In function ‘wayland_create_shm_buffer’:
> wayland/native_shm.c:98:10: error: ‘WL_SHM_FORMAT_PREMULTIPLIED_ARGB32’
> undeclared (first use in this function)
> wayland/native_shm.c:98:10: note: each undeclared identifier is reported
> only once for each function it appears in
> wayland/native_shm.c:98:47: error: ‘WL_SHM_FORMAT_ARGB32’ undeclared (first
> use in this function)
> wayland/native_shm.c:101:16: error: ‘WL_SHM_FORMAT_XRGB32’ undeclared (first
> use in this function)
> wayland/native_shm.c: In function ‘shm_handle_format’:
> wayland/native_shm.c:119:9: error: ‘WL_SHM_FORMAT_ARGB32’ undeclared (first
> use in this function)
> make[4]: *** [wayland/native_shm.o] Error 1
>
> Attached is a patch that finishes renaming the relevant variables.
>
> From 962a6f35d95edaba0ab44187901afdb37b9f206d Mon Sep 17 00:00:00 2001
> From: Scott Moreau <oreaus at gmail.com>
> Date: Tue, 17 Jan 2012 02:42:00 -0700
> Subject: [PATCH] Complete ARGB8888 naming convention format renames missed
> by 58dc1b28d1ef4d1931c52b079d304f2e1546329d.
>
> ---
>  .../state_trackers/egl/wayland/native_shm.c        |    7 +++----
>  1 files changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/src/gallium/state_trackers/egl/wayland/native_shm.c
> b/src/gallium/state_trackers/egl/wayland/native_shm.c
> index b76e5db..7d83e78 100644
> --- a/src/gallium/state_trackers/egl/wayland/native_shm.c
> +++ b/src/gallium/state_trackers/egl/wayland/native_shm.c
> @@ -94,11 +94,10 @@ wayland_create_shm_buffer(struct wayland_display
> *display,
>
>     switch (surface->color_format) {
>     case PIPE_FORMAT_B8G8R8A8_UNORM:
> -      format = (surface->premultiplied_alpha) ?
> -         WL_SHM_FORMAT_PREMULTIPLIED_ARGB32 : WL_SHM_FORMAT_ARGB32;
> +      format = WL_SHM_FORMAT_ARGB8888;
>        break;
>     case PIPE_FORMAT_B8G8R8X8_UNORM:
> -      format = WL_SHM_FORMAT_XRGB32;
> +      format = WL_SHM_FORMAT_XRGB8888;
>        break;
>     default:
>        return NULL;
> @@ -116,7 +115,7 @@ shm_handle_format(void *data, struct wl_shm *shm,
> uint32_t format)
>     struct wayland_shm_display *shmdpy = data;
>
>     switch (format) {
> -   case WL_SHM_FORMAT_ARGB32:
> +   case WL_SHM_FORMAT_ARGB8888:
>        shmdpy->base.formats |= HAS_ARGB8888;
>        break;
>     case WL_SHM_FORMAT_XRGB8888:
> --
> 1.7.4.1
>
>