[gtk+] X11: Fix crash in gdk_x11_gl_context_texture_from_surface
- From: Alexander Larsson <alexl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] X11: Fix crash in gdk_x11_gl_context_texture_from_surface
- Date: Thu, 16 Oct 2014 11:01:26 +0000 (UTC)
commit 142368f0954e01f60aadb4ba620488fe83ccb68a
Author: Alexander Larsson <alexl redhat com>
Date: Thu Oct 16 12:58:43 2014 +0200
X11: Fix crash in gdk_x11_gl_context_texture_from_surface
We need to look at the impl_window for the gl rendering, not
the subwindow we're rendering into.
gdk/x11/gdkglcontext-x11.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/gdk/x11/gdkglcontext-x11.c b/gdk/x11/gdkglcontext-x11.c
index 1464d9a..3377f69 100644
--- a/gdk/x11/gdkglcontext-x11.c
+++ b/gdk/x11/gdkglcontext-x11.c
@@ -368,7 +368,7 @@ gdk_x11_gl_context_texture_from_surface (GdkGLContext *context,
if (glx_pixmap == NULL)
return FALSE;
- window = gdk_gl_context_get_window (gdk_gl_context_get_current ());
+ window = gdk_gl_context_get_window (gdk_gl_context_get_current ())->impl_window;
window_scale = gdk_window_get_scale_factor (window);
window_height = gdk_window_get_height (window);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]