summaryrefslogtreecommitdiff
path: root/protocol
diff options
context:
space:
mode:
authorKristian Høgsberg <krh@bitplanet.net>2011-08-30 21:26:19 -0400
committerKristian Høgsberg <krh@bitplanet.net>2011-08-31 18:34:21 -0400
commitc640571c00b0c1ffafb05b1ad5cd02cd511cb06a (patch)
treea18333b8cdb062e68f373f0ffd9e07e4c493deef /protocol
parentf9c8a691b2f01ca4ef8e2e950b43ab19b2703e62 (diff)
Remove the wl_visual interface
The visual interface was meant to be a generic mechanism for specifying the content of a buffer. It goes back to before we had the buffer factory interfaces (like wl_drm and wl_shm) and we wanted to keep it open-ended enough that yuv, png or even svg buffer or so would be possible. Now that we have the buffer abstraction, we can add different buffer types by introducing new interfaces that create buffers. It only makes sense to leave it to those interfaces to specify the contents of the buffers. For wl_shm, this means that we now just specify the pixel format using an enum. For EGL buffers, the exact pixel formats are controlled by the implementation (part of wl_drm and similar), and from the client point of view, everything is controlled using EGLConfigs.
Diffstat (limited to 'protocol')
-rw-r--r--protocol/wayland.xml33
1 files changed, 13 insertions, 20 deletions
diff --git a/protocol/wayland.xml b/protocol/wayland.xml
index 23a70e7..e1d11cb 100644
--- a/protocol/wayland.xml
+++ b/protocol/wayland.xml
@@ -93,32 +93,27 @@
<request name="create_surface">
<arg name="id" type="new_id" interface="wl_surface"/>
</request>
-
- <enum name="visual">
- <entry name="argb32" value="0"/>
- <entry name="premultiplied_argb32" value="1"/>
- <entry name="xrgb32" value="2"/>
- </enum>
-
- <event name="token_visual">
- <arg name="name" type="uint"/>
- <arg name="token" type="uint"/>
- </event>
</interface>
<!-- Shared memory support -->
<interface name="wl_shm" version="1">
<enum name="error">
- <entry name="invalid_visual" value="0"/>
+ <entry name="invalid_format" value="0"/>
<entry name="invalid_stride" value="1"/>
<entry name="invalid_fd" value="2"/>
</enum>
+ <enum name="format">
+ <entry name="argb32" value="0"/>
+ <entry name="premultiplied_argb32" value="1"/>
+ <entry name="xrgb32" value="2"/>
+ </enum>
+
<!-- Transfer a shm buffer to the server. The allocated buffer
would include at least stride * height bytes starting at the
beginning of fd. The file descriptor is transferred over the
socket using AF_UNIX magical features. width, height, stride
- and visual describe the respective properties of the pixel
+ and format describe the respective properties of the pixel
data contained in the buffer. -->
<request name="create_buffer">
<arg name="id" type="new_id" interface="wl_buffer"/>
@@ -126,8 +121,12 @@
<arg name="width" type="int"/>
<arg name="height" type="int"/>
<arg name="stride" type="uint"/>
- <arg name="visual" type="object" interface="wl_visual"/>
+ <arg name="format" type="uint"/>
</request>
+
+ <event name="format">
+ <arg name="format" type="uint"/>
+ </event>
</interface>
@@ -547,10 +546,4 @@
</event>
</interface>
-
- <!-- A visual is the pixel format. The different visuals are
- currently only identified by the order they are advertised by
- the 'global' events. We need something better. -->
- <interface name="wl_visual" version="1"/>
-
</protocol>