diff options
| author | Denis Washington <denisw@online.de> | 2011-08-30 08:38:03 +0200 |
|---|---|---|
| committer | Denis Washington <denisw@online.de> | 2011-08-30 08:38:03 +0200 |
| commit | cea54613538ffaa0a2cf2326de1822f740de1361 (patch) | |
| tree | c18de79055af8c6466ab882ac1f257c93c316311 /gdk/wayland/gdkwindow-wayland.c | |
| parent | c2107aebe708d44e04a34f9549c110a82cce5153 (diff) | |
| parent | 143f943905fc75cb5888011b641e447ee5c75037 (diff) | |
| download | gtk+-gtkbuilder-gbinding-transform.tar.gz | |
Merge branch 'gtkbuilder-gbinding' into gtkbuilder-gbinding-transformgtkbuilder-gbinding-transform
Diffstat (limited to 'gdk/wayland/gdkwindow-wayland.c')
| -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, |