mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Benjamin Franzke
2011-07-16 19:50:32 +00:00
parent 97ba2e6015
commit 22d5481f91
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
clients/window.c
+14
View File
@@ -702,10 +702,13 @@ window_attach_surface(struct window *window)
{ {
struct display *display = window->display; struct display *display = window->display;
struct wl_buffer *buffer; struct wl_buffer *buffer;
#ifdef HAVE_CAIRO_EGL
struct egl_window_surface_data *data; struct egl_window_surface_data *data;
#endif
int32_t x, y; int32_t x, y;
switch (window->buffer_type) { switch (window->buffer_type) {
#ifdef HAVE_CAIRO_EGL
case WINDOW_BUFFER_TYPE_EGL_WINDOW: case WINDOW_BUFFER_TYPE_EGL_WINDOW:
data = cairo_surface_get_user_data(window->cairo_surface, data = cairo_surface_get_user_data(window->cairo_surface,
&surface_data_key); &surface_data_key);
@@ -716,6 +719,7 @@ window_attach_surface(struct window *window)
&window->server_allocation.height); &window->server_allocation.height);
break; break;
case WINDOW_BUFFER_TYPE_EGL_IMAGE: case WINDOW_BUFFER_TYPE_EGL_IMAGE:
#endif
case WINDOW_BUFFER_TYPE_SHM: case WINDOW_BUFFER_TYPE_SHM:
window_get_resize_dx_dy(window, &x, &y); window_get_resize_dx_dy(window, &x, &y);
@@ -734,6 +738,8 @@ window_attach_surface(struct window *window)
wl_display_sync_callback(display->display, free_surface, wl_display_sync_callback(display->display, free_surface,
window); window);
break; break;
default:
return;
} }
if (window->fullscreen) if (window->fullscreen)
@@ -781,6 +787,7 @@ window_set_surface(struct window *window, cairo_surface_t *surface)
window->cairo_surface = surface; window->cairo_surface = surface;
} }
#ifdef HAVE_CAIRO_EGL
static void static void
window_resize_cairo_window_surface(struct window *window) window_resize_cairo_window_surface(struct window *window)
{ {
@@ -800,6 +807,7 @@ window_resize_cairo_window_surface(struct window *window)
window->allocation.width, window->allocation.width,
window->allocation.height); window->allocation.height);
} }
#endif
void void
window_create_surface(struct window *window) window_create_surface(struct window *window)
@@ -1508,8 +1516,12 @@ window_create_internal(struct display *display, struct window *parent,
window->transparent = 1; window->transparent = 1;
if (display->dpy) if (display->dpy)
#ifdef HAVE_CAIRO_EGL
/* FIXME: make TYPE_EGL_IMAGE choosable for testing */ /* FIXME: make TYPE_EGL_IMAGE choosable for testing */
window->buffer_type = WINDOW_BUFFER_TYPE_EGL_WINDOW; window->buffer_type = WINDOW_BUFFER_TYPE_EGL_WINDOW;
#else
window->buffer_type = WINDOW_BUFFER_TYPE_SHM;
#endif
else else
window->buffer_type = WINDOW_BUFFER_TYPE_SHM; window->buffer_type = WINDOW_BUFFER_TYPE_SHM;
@@ -2011,6 +2023,7 @@ display_acquire_window_surface(struct display *display,
struct window *window, struct window *window,
EGLContext ctx) EGLContext ctx)
{ {
#ifdef HAVE_CAIRO_EGL
struct egl_window_surface_data *data; struct egl_window_surface_data *data;
if (!window->cairo_surface) if (!window->cairo_surface)
@@ -2025,6 +2038,7 @@ display_acquire_window_surface(struct display *display,
cairo_device_acquire(display->device); cairo_device_acquire(display->device);
if (!eglMakeCurrent(display->dpy, data->surf, data->surf, ctx)) if (!eglMakeCurrent(display->dpy, data->surf, data->surf, ctx))
fprintf(stderr, "failed to make surface current\n"); fprintf(stderr, "failed to make surface current\n");
#endif
} }
void void
configure.ac
+2 -1
View File
@@ -101,7 +101,8 @@ if test x$enable_clients == xyes; then
PKG_CHECK_MODULES(CAIRO_EGL, [cairo-egl >= 1.11.3], PKG_CHECK_MODULES(CAIRO_EGL, [cairo-egl >= 1.11.3],
[have_cairo_egl=yes], [have_cairo_egl=no]) [have_cairo_egl=yes], [have_cairo_egl=no])
AS_IF([test "x$have_cairo_egl" = "xyes"], 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 fi
AM_CONDITIONAL(HAVE_POPPLER, test "x$have_poppler" = "xyes") AM_CONDITIONAL(HAVE_POPPLER, test "x$have_poppler" = "xyes")