summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDerek Foreman <derekf@osg.samsung.com>2017-02-10 10:25:53 -0600
committerDerek Foreman <derekf@osg.samsung.com>2017-02-10 10:25:53 -0600
commit3dd19f16cb842c74404a76d0372b3e95d82c9e6f (patch)
tree72fa599c0613bdc332893d910ab0ef73fc656fe4 /src
parentd53ed9b0db072b69d303e6ab3352643ce2a265bc (diff)
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.
Diffstat (limited to 'src')
-rw-r--r--src/lib/ecore_wl2/ecore_wl2_display.c8
1 files 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 b469e4ce40..e9016d4a0b 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
125 125
126 if (!strcmp(interface, "wl_compositor")) 126 if (!strcmp(interface, "wl_compositor"))
127 { 127 {
128 unsigned int request_version = 3; 128 ewd->wl.compositor_version = MIN(version, 4);
129#ifdef WL_SURFACE_DAMAGE_BUFFER_SINCE_VERSION
130 request_version = 4;
131#endif
132 ewd->wl.compositor = 129 ewd->wl.compositor =
133 wl_registry_bind(registry, id, &wl_compositor_interface, 130 wl_registry_bind(registry, id, &wl_compositor_interface,
134 MIN(version, request_version)); 131 ewd->wl.compositor_version);
135 ewd->wl.compositor_version = MIN(version, request_version);
136 } 132 }
137 else if (!strcmp(interface, "wl_subcompositor")) 133 else if (!strcmp(interface, "wl_subcompositor"))
138 { 134 {