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

GdkGLContext: Add display property

Browse Source 
We need to use this in the code path where we make the context
non-current during destroy, because at that point the window
could be destroyed and gdk_window_get_display() would return
NULL.
This commit is contained in:
Alexander Larsson
2014-11-03 13:20:55 +01:00
parent 3656c21030
commit 6fbc439fd7
4 changed files with 65 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -206,7 +206,7 @@ gdk_x11_gl_context_end_frame (GdkGLContext *context,
{
GdkX11GLContext *context_x11 = GDK_X11_GL_CONTEXT (context);
GdkWindow *window = gdk_gl_context_get_window (context);
GdkDisplay *display = gdk_window_get_display (window);
GdkDisplay *display = gdk_gl_context_get_display (context);
Display *dpy = gdk_x11_display_get_xdisplay (display);
GdkX11Display *display_x11 = GDK_X11_DISPLAY (display);
DrawableInfo *info;
@ -503,8 +503,7 @@ gdk_x11_gl_context_dispose (GObject *gobject)
if (context_x11->glx_context != NULL)
{
GdkGLContext *context = GDK_GL_CONTEXT (gobject);
GdkWindow *window = gdk_gl_context_get_window (context);
GdkDisplay *display = gdk_window_get_display (window);
GdkDisplay *display = gdk_gl_context_get_display (context);
Display *dpy = gdk_x11_display_get_xdisplay (display);
if (glXGetCurrentContext () == context_x11->glx_context)
@ -1119,6 +1118,7 @@ gdk_x11_window_create_gl_context (GdkWindow *window,
is_direct ? "direct" : "indirect"));
context = g_object_new (GDK_TYPE_X11_GL_CONTEXT,
"display", display,
"window", window,
"profile", profile,
"shared-context", share,