summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--protocol/wayland.xml5
-rw-r--r--src/wayland-shm.c11
2 files changed, 7 insertions, 9 deletions
diff --git a/protocol/wayland.xml b/protocol/wayland.xml
index 78d4734..cdbbfd0 100644
--- a/protocol/wayland.xml
+++ b/protocol/wayland.xml
@@ -108,9 +108,8 @@
</enum>
<enum name="format">
- <entry name="argb32" value="0"/>
- <entry name="premultiplied_argb32" value="1"/>
- <entry name="xrgb32" value="2"/>
+ <entry name="argb8888" value="0"/>
+ <entry name="xrgb8888" value="1"/>
</enum>
<!-- Transfer a shm buffer to the server. The allocated buffer
diff --git a/src/wayland-shm.c b/src/wayland-shm.c
index c6020ae..2998c3d 100644
--- a/src/wayland-shm.c
+++ b/src/wayland-shm.c
@@ -123,9 +123,8 @@ shm_create_buffer(struct wl_client *client, struct wl_resource *resource,
switch (format) {
- case WL_SHM_FORMAT_ARGB32:
- case WL_SHM_FORMAT_PREMULTIPLIED_ARGB32:
- case WL_SHM_FORMAT_XRGB32:
+ case WL_SHM_FORMAT_ARGB8888:
+ case WL_SHM_FORMAT_XRGB8888:
break;
default:
wl_resource_post_error(resource,
@@ -179,10 +178,10 @@ bind_shm(struct wl_client *client,
resource = wl_client_add_object(client, &wl_shm_interface,
&shm_interface, id, data);
- wl_resource_post_event(resource, WL_SHM_FORMAT, WL_SHM_FORMAT_ARGB32);
wl_resource_post_event(resource, WL_SHM_FORMAT,
- WL_SHM_FORMAT_PREMULTIPLIED_ARGB32);
- wl_resource_post_event(resource, WL_SHM_FORMAT, WL_SHM_FORMAT_XRGB32);
+ WL_SHM_FORMAT_ARGB8888);
+ wl_resource_post_event(resource, WL_SHM_FORMAT,
+ WL_SHM_FORMAT_XRGB8888);
}
WL_EXPORT struct wl_shm *