Merge branch 'missing-shm-pool-error' into 'main'

Add missing wl_shm_pool::error enum

See merge request wayland/wayland!542
This commit is contained in:
Robert Ancell 2026-04-28 22:30:39 +00:00
commit 20b8ce1be1

View file

@ -220,7 +220,7 @@
</request> </request>
</interface> </interface>
<interface name="wl_shm_pool" version="2"> <interface name="wl_shm_pool" version="3">
<description summary="a shared memory pool"> <description summary="a shared memory pool">
The wl_shm_pool object encapsulates a piece of memory shared The wl_shm_pool object encapsulates a piece of memory shared
between the compositor and client. Through the wl_shm_pool between the compositor and client. Through the wl_shm_pool
@ -231,6 +231,14 @@
a surface or for many small buffers. a surface or for many small buffers.
</description> </description>
<enum name="error" since="3">
<description summary="wl_shm_pool error values">
These errors can be emitted in response to wl_shm_pool requests.
</description>
<entry name="invalid_format" value="0" summary="buffer format is not known"/>
<entry name="invalid_stride" value="1" summary="invalid size or stride during buffer creation"/>
</enum>
<request name="create_buffer"> <request name="create_buffer">
<description summary="create a buffer from the pool"> <description summary="create a buffer from the pool">
Create a wl_buffer object from the pool. Create a wl_buffer object from the pool.
@ -280,7 +288,7 @@
</request> </request>
</interface> </interface>
<interface name="wl_shm" version="2"> <interface name="wl_shm" version="3">
<description summary="shared memory support"> <description summary="shared memory support">
A singleton global object that provides support for shared A singleton global object that provides support for shared
memory. memory.
@ -293,12 +301,12 @@
that can be used for buffers. that can be used for buffers.
</description> </description>
<enum name="error"> <enum name="error" since="3">
<description summary="wl_shm error values"> <description summary="wl_shm error values">
These errors can be emitted in response to wl_shm requests. These errors can be emitted in response to wl_shm requests.
</description> </description>
<entry name="invalid_format" value="0" summary="buffer format is not known"/> <entry name="invalid_format" value="0" summary="buffer format is not known" deprecated-since="3"/>
<entry name="invalid_stride" value="1" summary="invalid size or stride during pool or buffer creation"/> <entry name="invalid_stride" value="1" summary="invalid size or stride during pool creation"/>
<entry name="invalid_fd" value="2" summary="mmapping the file descriptor failed"/> <entry name="invalid_fd" value="2" summary="mmapping the file descriptor failed"/>
</enum> </enum>