callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GdkGLContextX11: Use passed in context, not get_current()

Browse Source
This commit is contained in:
Alexander Larsson
2014-11-06 09:10:34 +01:00
parent 10a44e8f7a
commit 8c6395d8a1
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gdk/x11/gdkglcontext-x11.c
View File

@ -380,11 +380,10 @@ glx_pixmap_get (cairo_surface_t *surface)
}
static gboolean
gdk_x11_gl_context_texture_from_surface (GdkGLContext *context,
gdk_x11_gl_context_texture_from_surface (GdkGLContext *paint_context,
cairo_surface_t *surface,
cairo_region_t *region)
{
GdkGLContext *current;
GdkGLXPixmap *glx_pixmap;
double device_x_offset, device_y_offset;
cairo_rectangle_int_t rect;
@ -405,11 +404,9 @@ gdk_x11_gl_context_texture_from_surface (GdkGLContext *context,
if (glx_pixmap == NULL)
return FALSE;
current = gdk_gl_context_get_current ();
use_texture_rectangle = gdk_gl_context_use_texture_rectangle (paint_context);
use_texture_rectangle = gdk_gl_context_use_texture_rectangle (current);
window = gdk_gl_context_get_window (current)->impl_window;
window = gdk_gl_context_get_window (paint_context)->impl_window;
window_scale = gdk_window_get_scale_factor (window);
window_height = gdk_window_get_height (window);