summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRobert Bragg <robert@linux.intel.com>2012-01-20 17:23:00 +0000
committerRobert Bragg <robert@linux.intel.com>2012-01-20 17:23:10 +0000
commit6f5d7b5b12e68e90841409220fb4f82b14202f64 (patch)
tree1b0cd2dcdc5dc5d872450d231f4078cfc86b3069 /src
parent23ba9c32762a8754ae3c993087a40b5f5ff38919 (diff)
fixups since the shm format enums changedwayland
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 b76e5db33d..7d83e78fb4 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: