From: Scott Moreau <oreaus@gmail.com>
Date: Tue, 17 Jan 2012 15:36:12 +0000 (-0500)
Subject: Complete ARGB8888 naming convention format renames missed
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b0640785811f7f5d363e14e6be84717637a0b00d;p=android-x86%2Fexternal-mesa.git

Complete ARGB8888 naming convention format renames missed
(cherry picked from commit e0897009f8fe8100204038e37f5555966300383a)
---

diff --git a/src/gallium/state_trackers/egl/wayland/native_shm.c b/src/gallium/state_trackers/egl/wayland/native_shm.c
index b76e5db33db..7d83e78fb49 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: