Commit 151ca457 authored by Kristian Høgsberg's avatar Kristian Høgsberg
Browse files

shm: Drop non-premul format, use less ambiguous ARGB8888 naming convention

This also matches the new wl_drm format names.
parent b2e619c7
......@@ -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
......
......@@ -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 *
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment