diff options
| author | Alexandros Frantzis <alexandros.frantzis@collabora.com> | 2019-08-02 16:29:57 +0300 |
|---|---|---|
| committer | Pekka Paalanen <pq@iki.fi> | 2019-08-02 15:00:08 +0000 |
| commit | 3802241c4611aa0c5453ace34603019108a3b637 (patch) | |
| tree | a5af55ff1ea5e78fadcd751ae359c72a1bd5cd5d | |
| parent | a89266f422d39cb02529b8503dfec040d499661e (diff) | |
| download | weston-3802241c4611aa0c5453ace34603019108a3b637.tar.gz | |
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>
| -rw-r--r-- | libweston/linux-explicit-synchronization.c | 4 | ||||
| -rw-r--r-- | tests/linux-explicit-synchronization-test.c | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/libweston/linux-explicit-synchronization.c b/libweston/linux-explicit-synchronization.c index f93a5d60..4b473839 100644 --- a/libweston/linux-explicit-synchronization.c +++ b/libweston/linux-explicit-synchronization.c @@ -245,11 +245,9 @@ bind_linux_explicit_synchronization(struct wl_client *client, WL_EXPORT int 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, &zwp_linux_explicit_synchronization_v1_interface, - 1, compositor, + 2, compositor, bind_linux_explicit_synchronization)) return -1; diff --git a/tests/linux-explicit-synchronization-test.c b/tests/linux-explicit-synchronization-test.c index a89b252b..7ef122c6 100644 --- a/tests/linux-explicit-synchronization-test.c +++ b/tests/linux-explicit-synchronization-test.c @@ -56,11 +56,11 @@ get_linux_explicit_synchronization(struct client *client) } assert(global_sync); - assert(global_sync->version == 1); + assert(global_sync->version == 2); sync = wl_registry_bind( client->wl_registry, global_sync->name, - &zwp_linux_explicit_synchronization_v1_interface, 1); + &zwp_linux_explicit_synchronization_v1_interface, 2); assert(sync); return sync; |