From cdd9db7ed2e492c75ecd172e436ca55d735a5066 Mon Sep 17 00:00:00 2001 From: Benjamin Franzke Date: Mon, 25 Apr 2011 17:47:44 +0200 Subject: [PATCH] compositor: Use EGL_WL_bind_wayland_display only if available --- compositor/compositor.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/compositor/compositor.c b/compositor/compositor.c index b76f301..86f5fa3 100644 --- a/compositor/compositor.c +++ b/compositor/compositor.c @@ -1853,7 +1853,9 @@ wlsc_compositor_init(struct wlsc_compositor *ec, struct wl_display *display) wl_compositor_init(&ec->compositor, &compositor_interface, display); ec->shm = wl_shm_init(display, &shm_callbacks); - eglBindWaylandDisplayWL(ec->display, ec->wl_display); + if (strstr(eglQueryString(ec->display, EGL_EXTENSIONS), + "EGL_WL_bind_wayland_display")) + eglBindWaylandDisplayWL(ec->display, ec->wl_display); wl_list_init(&ec->surface_list); wl_list_init(&ec->input_device_list); @@ -1992,7 +1994,9 @@ int main(int argc, char *argv[]) wl_display_run(display); - eglUnbindWaylandDisplayWL(ec->display, display); + if (strstr(eglQueryString(ec->display, EGL_EXTENSIONS), + "EGL_WL_bind_wayland_display")) + eglUnbindWaylandDisplayWL(ec->display, display); wl_display_destroy(display); ec->destroy(ec); -- 2.7.4