diff options
| author | Kristian Høgsberg <krh@bitplanet.net> | 2013-01-07 15:47:14 -0500 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2013-01-07 15:47:47 -0500 |
| commit | 4e51b44c539dc7b992bd060b817ae90f9de735bd (patch) | |
| tree | b0ca3ccc9b8084c543a6937f527d5ff0749edd89 | |
| parent | d894351707f8cd47a28cf63fdc8a53f8d8d288c8 (diff) | |
| download | weston-4e51b44c539dc7b992bd060b817ae90f9de735bd.tar.gz | |
window: Fall back to cairo image when cairo EGL isn't available
| -rw-r--r-- | clients/window.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/clients/window.c b/clients/window.c index 0bc95268..2baf4d9f 100644 --- a/clients/window.c +++ b/clients/window.c @@ -3568,7 +3568,7 @@ window_create_internal(struct display *display, window->opaque_region = NULL; window->fullscreen_method = WL_SHELL_SURFACE_FULLSCREEN_METHOD_DEFAULT; - if (display->dpy) + if (display->argb_device) #ifdef HAVE_CAIRO_EGL window->buffer_type = WINDOW_BUFFER_TYPE_EGL_WINDOW; #else @@ -4268,8 +4268,7 @@ display_create(int argc, char *argv[]) wl_registry_add_listener(d->registry, ®istry_listener, d); wl_display_dispatch(d->display); #ifdef HAVE_CAIRO_EGL - if (init_egl(d) < 0) - return NULL; + init_egl(d); #endif create_cursors(d); @@ -4325,7 +4324,8 @@ display_destroy(struct display *display) destroy_cursors(display); #ifdef HAVE_CAIRO_EGL - fini_egl(display); + if (display->argb_device) + fini_egl(display); #endif if (display->shell) |