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

window: Only initialize egl if we have cairo egl

Browse Source
This commit is contained in:
Kristian Høgsberg
2012-04-03 11:57:44 -04:00
parent 16626282fd
commit 8f64ed0381
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
clients/window.c
+6
View File
@@ -2785,6 +2785,7 @@ fini_xkb(struct display *display)
xkb_free_keymap(display->xkb); xkb_free_keymap(display->xkb);
} }
#ifdef HAVE_CAIRO_EGL
static int static int
init_egl(struct display *d) init_egl(struct display *d)
{ {
@@ -2872,6 +2873,7 @@ fini_egl(struct display *display)
eglTerminate(display->dpy); eglTerminate(display->dpy);
eglReleaseThread(); eglReleaseThread();
} }
#endif
static int static int
event_mask_update(uint32_t mask, void *data) event_mask_update(uint32_t mask, void *data)
@@ -2927,8 +2929,10 @@ display_create(int argc, char *argv[])
/* Process connection events. */ /* Process connection events. */
wl_display_iterate(d->display, WL_DISPLAY_READABLE); wl_display_iterate(d->display, WL_DISPLAY_READABLE);
#ifdef HAVE_CAIRO_EGL
if (init_egl(d) < 0) if (init_egl(d) < 0)
return NULL; return NULL;
#endif
d->image_target_texture_2d = d->image_target_texture_2d =
(void *) eglGetProcAddress("glEGLImageTargetTexture2DOES"); (void *) eglGetProcAddress("glEGLImageTargetTexture2DOES");
@@ -2985,7 +2989,9 @@ display_destroy(struct display *display)
cairo_surface_destroy(display->shadow); cairo_surface_destroy(display->shadow);
destroy_pointer_surfaces(display); destroy_pointer_surfaces(display);
#ifdef HAVE_CAIRO_EGL
fini_egl(display); fini_egl(display);
#endif
if (display->shell) if (display->shell)
wl_shell_destroy(display->shell); wl_shell_destroy(display->shell);