[wayland v2 1/2] protocol: Copy missing pixel formats from wl_drm to wl_shm

[Kristian Høgsberg]

On Thu, Jul 11, 2013 at 04:08:20PM +0200, Tomeu Vizoso wrote:
> ---
>  protocol/wayland.xml | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++-

This looks good, applied.

Kristian

>  1 file changed, 64 insertions(+), 1 deletion(-)
> 
> diff --git a/protocol/wayland.xml b/protocol/wayland.xml
> index 1442b6a..3cfa953 100644
> --- a/protocol/wayland.xml
> +++ b/protocol/wayland.xml
> @@ -274,10 +274,73 @@
>  
>      <enum name="format">
>        <description summary="pixel formats">
> -	This describes the memory layout of an individual pixel.
> +       This describes the memory layout of an individual pixel.
> +
> +       All renderers should support argb8888 and xrgb8888 but any other
> +       formats are optional and may not be supported by the particular
> +       renderer in use.
>        </description>
>        <entry name="argb8888" value="0" summary="32-bit ARGB format"/>
>        <entry name="xrgb8888" value="1" summary="32-bit RGB format"/>
> +      <!-- The drm format codes match the #defines in drm_fourcc.h.
> +           The formats actually supported by the compositor will be
> +           reported by the format event. -->
> +      <entry name="c8" value="0x20203843"/>
> +      <entry name="rgb332" value="0x38424752"/>
> +      <entry name="bgr233" value="0x38524742"/>
> +      <entry name="xrgb4444" value="0x32315258"/>
> +      <entry name="xbgr4444" value="0x32314258"/>
> +      <entry name="rgbx4444" value="0x32315852"/>
> +      <entry name="bgrx4444" value="0x32315842"/>
> +      <entry name="argb4444" value="0x32315241"/>
> +      <entry name="abgr4444" value="0x32314241"/>
> +      <entry name="rgba4444" value="0x32314152"/>
> +      <entry name="bgra4444" value="0x32314142"/>
> +      <entry name="xrgb1555" value="0x35315258"/>
> +      <entry name="xbgr1555" value="0x35314258"/>
> +      <entry name="rgbx5551" value="0x35315852"/>
> +      <entry name="bgrx5551" value="0x35315842"/>
> +      <entry name="argb1555" value="0x35315241"/>
> +      <entry name="abgr1555" value="0x35314241"/>
> +      <entry name="rgba5551" value="0x35314152"/>
> +      <entry name="bgra5551" value="0x35314142"/>
> +      <entry name="rgb565" value="0x36314752"/>
> +      <entry name="bgr565" value="0x36314742"/>
> +      <entry name="rgb888" value="0x34324752"/>
> +      <entry name="bgr888" value="0x34324742"/>
> +      <entry name="xbgr8888" value="0x34324258"/>
> +      <entry name="rgbx8888" value="0x34325852"/>
> +      <entry name="bgrx8888" value="0x34325842"/>
> +      <entry name="abgr8888" value="0x34324241"/>
> +      <entry name="rgba8888" value="0x34324152"/>
> +      <entry name="bgra8888" value="0x34324142"/>
> +      <entry name="xrgb2101010" value="0x30335258"/>
> +      <entry name="xbgr2101010" value="0x30334258"/>
> +      <entry name="rgbx1010102" value="0x30335852"/>
> +      <entry name="bgrx1010102" value="0x30335842"/>
> +      <entry name="argb2101010" value="0x30335241"/>
> +      <entry name="abgr2101010" value="0x30334241"/>
> +      <entry name="rgba1010102" value="0x30334152"/>
> +      <entry name="bgra1010102" value="0x30334142"/>
> +      <entry name="yuyv" value="0x56595559"/>
> +      <entry name="yvyu" value="0x55595659"/>
> +      <entry name="uyvy" value="0x59565955"/>
> +      <entry name="vyuy" value="0x59555956"/>
> +      <entry name="ayuv" value="0x56555941"/>
> +      <entry name="nv12" value="0x3231564e"/>
> +      <entry name="nv21" value="0x3132564e"/>
> +      <entry name="nv16" value="0x3631564e"/>
> +      <entry name="nv61" value="0x3136564e"/>
> +      <entry name="yuv410" value="0x39565559"/>
> +      <entry name="yvu410" value="0x39555659"/>
> +      <entry name="yuv411" value="0x31315559"/>
> +      <entry name="yvu411" value="0x31315659"/>
> +      <entry name="yuv420" value="0x32315559"/>
> +      <entry name="yvu420" value="0x32315659"/>
> +      <entry name="yuv422" value="0x36315559"/>
> +      <entry name="yvu422" value="0x36315659"/>
> +      <entry name="yuv444" value="0x34325559"/>
> +      <entry name="yvu444" value="0x34325659"/>
>      </enum>
>  
>      <request name="create_pool">
> -- 
> 1.8.3.1
> 
> _______________________________________________
> wayland-devel mailing list
> wayland-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/wayland-devel