AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'wip/otte/for-main' into 'main'

Browse Source 
testsuite: clear_current() when done

See merge request GNOME/gtk!4343
This commit is contained in:
Benjamin Otte 2022-01-06 19:07:58 +00:00
commit 8e8a746cce
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gdk/gdkglcontext.c
View File

@ -185,8 +185,7 @@ gdk_gl_context_dispose (GObject *gobject)
if (priv->egl_context != NULL) if (priv->egl_context != NULL)
{ {
GdkSurface *surface = gdk_gl_context_get_surface (context); GdkDisplay *display = gdk_draw_context_get_display (GDK_DRAW_CONTEXT (context));
GdkDisplay *display = gdk_surface_get_display (surface);
EGLDisplay *egl_display = gdk_display_get_egl_display (display); EGLDisplay *egl_display = gdk_display_get_egl_display (display);
if (eglGetCurrentContext () == priv->egl_context) if (eglGetCurrentContext () == priv->egl_context)

1
testsuite/gdk/memorytexture.c
View File

@ -649,6 +649,7 @@ main (int argc, char *argv[])
gsk_renderer_unrealize (gl_renderer); gsk_renderer_unrealize (gl_renderer);
g_clear_object (&gl_renderer); g_clear_object (&gl_renderer);
} }
gdk_gl_context_clear_current ();
return result; return result;
} }

1
testsuite/gdk/texture-threads.c
View File

@ -108,6 +108,7 @@ texture_threads (void)
g_clear_pointer (&loop, g_main_loop_unref); g_clear_pointer (&loop, g_main_loop_unref);
g_clear_object (&gl_renderer); g_clear_object (&gl_renderer);
g_main_context_release (NULL); g_main_context_release (NULL);
gdk_gl_context_clear_current ();
} }
int int