[gtk+] wayland: Acquire cairo device during operations that need the GL context



commit 99f489b5ef70ffae15c4f05ffdc7952fcef19810
Author: Daniel Nicoara <dnicoara chromium org>
Date:   Mon Aug 22 16:31:27 2011 -0400

    wayland: Acquire cairo device during operations that need the GL context

 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 194d763..b2be78b 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,



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]