libweston: Advertise minor version 2 of zwp_linux_explicit_synchronization_v1

Although we already supported minor version 2 of the explicit sync
protocol, we couldn't advertise it previously, since it was not in any
released version of wayland-protocols. With the release of
wayland-protocols 1.18, which includes minor version 2 of this protocol,
and the recent update in weston to require 1.18, we can now safely
advertise minor version 2.

Signed-off-by: Alexandros Frantzis <alexandros.frantzis@collabora.com>
dev
Alexandros Frantzis 5 years ago committed by Pekka Paalanen
parent a89266f422
commit 3802241c46
  1. 4
      libweston/linux-explicit-synchronization.c
  2. 4
      tests/linux-explicit-synchronization-test.c

@ -245,11 +245,9 @@ bind_linux_explicit_synchronization(struct wl_client *client,
WL_EXPORT int WL_EXPORT int
linux_explicit_synchronization_setup(struct weston_compositor *compositor) linux_explicit_synchronization_setup(struct weston_compositor *compositor)
{ {
/* TODO: Update to minor version 2 when the next version of
* wayland-protocols that contains it is released. */
if (!wl_global_create(compositor->wl_display, if (!wl_global_create(compositor->wl_display,
&zwp_linux_explicit_synchronization_v1_interface, &zwp_linux_explicit_synchronization_v1_interface,
1, compositor, 2, compositor,
bind_linux_explicit_synchronization)) bind_linux_explicit_synchronization))
return -1; return -1;

@ -56,11 +56,11 @@ get_linux_explicit_synchronization(struct client *client)
} }
assert(global_sync); assert(global_sync);
assert(global_sync->version == 1); assert(global_sync->version == 2);
sync = wl_registry_bind( sync = wl_registry_bind(
client->wl_registry, global_sync->name, client->wl_registry, global_sync->name,
&zwp_linux_explicit_synchronization_v1_interface, 1); &zwp_linux_explicit_synchronization_v1_interface, 2);
assert(sync); assert(sync);
return sync; return sync;

Loading…
Cancel
Save