diff options
| author | Daniel Nicoara <dnicoara@chromium.org> | 2011-08-22 16:31:27 -0400 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2011-08-22 16:32:06 -0400 |
| commit | 99f489b5ef70ffae15c4f05ffdc7952fcef19810 (patch) | |
| tree | a61feeab3fe06088b679a7a1589a5ac1cb252834 | |
| parent | 005894eccbd438022d968e8a855523ecadc5027d (diff) | |
| download | gtk+-99f489b5ef70ffae15c4f05ffdc7952fcef19810.tar.gz | |
wayland: Acquire cairo device during operations that need the GL context
| -rw-r--r-- | gdk/wayland/gdkwindow-wayland.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/gdk/wayland/gdkwindow-wayland.c b/gdk/wayland/gdkwindow-wayland.c index 194d7633e5..b2be78b34d 100644 --- a/gdk/wayland/gdkwindow-wayland.c +++ b/gdk/wayland/gdkwindow-wayland.c @@ -400,9 +400,11 @@ gdk_wayland_create_cairo_surface (GdkDisplayWayland *display, display->create_image(display->egl_display, NULL, EGL_NATIVE_PIXMAP_KHR, (EGLClientBuffer) data->pixmap, NULL); + cairo_device_acquire(display->cairo_device); glGenTextures(1, &data->texture); glBindTexture(GL_TEXTURE_2D, data->texture); display->image_target_texture_2d(GL_TEXTURE_2D, data->image); + cairo_device_release(display->cairo_device); surface = cairo_gl_surface_create_for_texture(display->cairo_device, CAIRO_CONTENT_COLOR_ALPHA, |