From 3dd19f16cb842c74404a76d0372b3e95d82c9e6f Mon Sep 17 00:00:00 2001 From: Derek Foreman Date: Fri, 10 Feb 2017 10:25:53 -0600 Subject: [PATCH] ecore_wl2: Update compositor bind now that damage_buffer is released We had to do some weird special case stuff when binding wl_compositor because we implemented damage buffer before depending on a wayland release that provided it. Now our wayland dep is newer than damage buffer, so the test can be more conventional. Should have no functional change. --- src/lib/ecore_wl2/ecore_wl2_display.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/lib/ecore_wl2/ecore_wl2_display.c b/src/lib/ecore_wl2/ecore_wl2_display.c index b469e4c..e9016d4 100644 --- a/src/lib/ecore_wl2/ecore_wl2_display.c +++ b/src/lib/ecore_wl2/ecore_wl2_display.c @@ -125,14 +125,10 @@ _cb_global_add(void *data, struct wl_registry *registry, unsigned int id, const if (!strcmp(interface, "wl_compositor")) { - unsigned int request_version = 3; -#ifdef WL_SURFACE_DAMAGE_BUFFER_SINCE_VERSION - request_version = 4; -#endif + ewd->wl.compositor_version = MIN(version, 4); ewd->wl.compositor = wl_registry_bind(registry, id, &wl_compositor_interface, - MIN(version, request_version)); - ewd->wl.compositor_version = MIN(version, request_version); + ewd->wl.compositor_version); } else if (!strcmp(interface, "wl_subcompositor")) { -- 2.7.4