[vlc-commits] wayland/shell: request compositor version 2 if available

Rémi Denis-Courmont git at videolan.org
Sun Oct 5 13:41:26 CEST 2014


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Oct  5 13:19:20 2014 +0300| [e73f49e50760f89f77bf792549eb63babf30be22] | committer: Rémi Denis-Courmont

wayland/shell: request compositor version 2 if available

This is required for wl_surface.set_buffer_transform.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e73f49e50760f89f77bf792549eb63babf30be22
---

 modules/video_output/wl/shell_surface.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/video_output/wl/shell_surface.c b/modules/video_output/wl/shell_surface.c
index 967b520..34ad8ea 100644
--- a/modules/video_output/wl/shell_surface.c
+++ b/modules/video_output/wl/shell_surface.c
@@ -162,7 +162,8 @@ static void registry_global_cb(void *data, struct wl_registry *registry,
 
     if (!strcmp(iface, "wl_compositor"))
         sys->compositor = wl_registry_bind(registry, name,
-                                           &wl_compositor_interface, 1);
+                                           &wl_compositor_interface,
+                                           (vers < 2) ? vers : 2);
     else
     if (!strcmp(iface, "wl_output"))
         sys->output = wl_registry_bind(registry, name, &wl_output_interface,



More information about the vlc-commits mailing list