From: Benjamin Franzke <benjaminfranzke@googlemail.com>
Date: Mon, 25 Apr 2011 15:47:44 +0000 (+0200)
Subject: compositor: Use EGL_WL_bind_wayland_display only if available
X-Git-Tag: upstream/0.1.8~3475
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cdd9db7ed2e492c75ecd172e436ca55d735a5066;p=profile%2Fivi%2Fweston-ivi-shell.git

compositor: Use EGL_WL_bind_wayland_display only if available
---

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);