commit 22d5481f911053c17d8346d3273847371012a024
author Benjamin Franzke <benjaminfranzke@googlemail.com> Sat Jul 16 19:50:32 2011 +0000
committer Benjamin Franzke <benjaminfranzke@googlemail.com> Fri Jul 15 17:56:04 2011 +0000
tree 0593dcb7bcdc87d5f78a67fca09a6db1359101e7
parent 97ba2e601555462a5f2b7375d41ca1098e641721

window.c: Fix compile/run using cairo without egl

clients/window.c

diff --git a/clients/window.c b/clients/window.c
index 95e46d5..5679f89 100644
--- a/clients/window.c
+++ b/clients/window.c
@@ -702,10 +702,13 @@
 {
 	struct display *display = window->display;
 	struct wl_buffer *buffer;
+#ifdef HAVE_CAIRO_EGL
 	struct egl_window_surface_data *data;
+#endif
 	int32_t x, y;
 
 	switch (window->buffer_type) {
+#ifdef HAVE_CAIRO_EGL
 	case WINDOW_BUFFER_TYPE_EGL_WINDOW:
 		data = cairo_surface_get_user_data(window->cairo_surface,
 						   &surface_data_key);
@@ -716,6 +719,7 @@
 				&window->server_allocation.height);
 		break;
 	case WINDOW_BUFFER_TYPE_EGL_IMAGE:
+#endif
 	case WINDOW_BUFFER_TYPE_SHM:
 		window_get_resize_dx_dy(window, &x, &y);
 
@@ -734,6 +738,8 @@
 		wl_display_sync_callback(display->display, free_surface,
 					 window);
 		break;
+	default:
+		return;
 	}
 
 	if (window->fullscreen)
@@ -781,6 +787,7 @@
 	window->cairo_surface = surface;
 }
 
+#ifdef HAVE_CAIRO_EGL
 static void
 window_resize_cairo_window_surface(struct window *window)
 {
@@ -800,6 +807,7 @@
 				  window->allocation.width,
 				  window->allocation.height);
 }
+#endif
 
 void
 window_create_surface(struct window *window)
@@ -1508,8 +1516,12 @@
 	window->transparent = 1;
 
 	if (display->dpy)
+#ifdef HAVE_CAIRO_EGL
 		/* FIXME: make TYPE_EGL_IMAGE choosable for testing */
 		window->buffer_type = WINDOW_BUFFER_TYPE_EGL_WINDOW;
+#else
+		window->buffer_type = WINDOW_BUFFER_TYPE_SHM;
+#endif
 	else
 		window->buffer_type = WINDOW_BUFFER_TYPE_SHM;
 
@@ -2011,6 +2023,7 @@
 			       struct window *window,
 			       EGLContext ctx)
 {
+#ifdef HAVE_CAIRO_EGL
 	struct egl_window_surface_data *data;
 
 	if (!window->cairo_surface)
@@ -2025,6 +2038,7 @@
 	cairo_device_acquire(display->device);
 	if (!eglMakeCurrent(display->dpy, data->surf, data->surf, ctx))
 		fprintf(stderr, "failed to make surface current\n");
+#endif
 }
 
 void

configure.ac

diff --git a/configure.ac b/configure.ac
index badecfe..756b125 100644
--- a/configure.ac
+++ b/configure.ac
@@ -101,7 +101,8 @@
   PKG_CHECK_MODULES(CAIRO_EGL, [cairo-egl >= 1.11.3],
 		    [have_cairo_egl=yes], [have_cairo_egl=no])
   AS_IF([test "x$have_cairo_egl" = "xyes"],
-        [AC_DEFINE([HAVE_CAIRO_EGL], [1], [Have cairo-egl])])
+        [AC_DEFINE([HAVE_CAIRO_EGL], [1], [Have cairo-egl])],
+        [AC_MSG_WARN([Cairo-EGL not found - clients will use cairo image])])
 fi
 
 AM_CONDITIONAL(HAVE_POPPLER, test "x$have_poppler" = "xyes")