[mutter] tests/wayland: Bump wl_compositor version for test clients
- From: Marge Bot <marge-bot src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] tests/wayland: Bump wl_compositor version for test clients
- Date: Fri, 3 Jun 2022 09:26:55 +0000 (UTC)
commit db2cf4b8744002c15c5563e26e0b62242fbc09c8
Author: Robert Mader <robert mader collabora com>
Date: Sun May 22 16:19:17 2022 +0200
tests/wayland: Bump wl_compositor version for test clients
Version 2 is required for buffer transform, however directly going
for the highest currently supported version doesn't break any
tests and makes more features available.
Also fix indentation below while on it.
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1055>
src/tests/wayland-test-clients/wayland-test-client-utils.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/src/tests/wayland-test-clients/wayland-test-client-utils.c
b/src/tests/wayland-test-clients/wayland-test-client-utils.c
index 3cb068056a..19ddd2861a 100644
--- a/src/tests/wayland-test-clients/wayland-test-client-utils.c
+++ b/src/tests/wayland-test-clients/wayland-test-client-utils.c
@@ -151,7 +151,8 @@ handle_registry_global (void *user_data,
if (strcmp (interface, "wl_compositor") == 0)
{
display->compositor =
- wl_registry_bind (registry, id, &wl_compositor_interface, 1);
+ wl_registry_bind (registry, id, &wl_compositor_interface,
+ MIN (version, 5));
}
else if (strcmp (interface, "wl_subcompositor") == 0)
{
@@ -161,7 +162,7 @@ handle_registry_global (void *user_data,
else if (strcmp (interface, "wl_shm") == 0)
{
display->shm = wl_registry_bind (registry,
- id, &wl_shm_interface, 1);
+ id, &wl_shm_interface, 1);
}
else if (strcmp (interface, "xdg_wm_base") == 0)
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]