summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorScott Moreau <[email protected]>2012-01-17 10:36:12 -0500
committerKristian Høgsberg <[email protected]>2012-01-17 10:36:12 -0500
commite0897009f8fe8100204038e37f5555966300383a (patch)
tree1a5d9d852877d0f0759d5cda85f773afecfc7abc /src
parent7e08bf08d13228001f6306800b5bd69b89b1bb6f (diff)
Complete ARGB8888 naming convention format renames missed
Diffstat (limited to 'src')
-rw-r--r--src/gallium/state_trackers/egl/wayland/native_shm.c7
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 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: