diff options
| author | Benjamin Otte <otte.benjamin@googlemail.com> | 2022-01-06 19:07:58 +0000 |
|---|---|---|
| committer | Benjamin Otte <otte.benjamin@googlemail.com> | 2022-01-06 19:07:58 +0000 |
| commit | 8e8a746cce41169f241a5285c605c9d2f10bd803 (patch) | |
| tree | a71b2570ab46fbff20e962a2d33b026932f31c29 | |
| parent | be81f6b4ab7d80bcd02908769311181e4a36997b (diff) | |
| parent | 5dc940ead2426fed6853351d14e3d9b99f4e999b (diff) | |
| download | gtk+-8e8a746cce41169f241a5285c605c9d2f10bd803.tar.gz | |
Merge branch 'wip/otte/for-main' into 'main'
testsuite: clear_current() when done
See merge request GNOME/gtk!4343
| -rw-r--r-- | gdk/gdkglcontext.c | 3 | ||||
| -rw-r--r-- | testsuite/gdk/memorytexture.c | 1 | ||||
| -rw-r--r-- | testsuite/gdk/texture-threads.c | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/gdk/gdkglcontext.c b/gdk/gdkglcontext.c index 62b60f5ebc..3c5e4ffdb1 100644 --- a/gdk/gdkglcontext.c +++ b/gdk/gdkglcontext.c @@ -185,8 +185,7 @@ gdk_gl_context_dispose (GObject *gobject) if (priv->egl_context != NULL) { - GdkSurface *surface = gdk_gl_context_get_surface (context); - GdkDisplay *display = gdk_surface_get_display (surface); + GdkDisplay *display = gdk_draw_context_get_display (GDK_DRAW_CONTEXT (context)); EGLDisplay *egl_display = gdk_display_get_egl_display (display); if (eglGetCurrentContext () == priv->egl_context) diff --git a/testsuite/gdk/memorytexture.c b/testsuite/gdk/memorytexture.c index bbc563bab9..372cece19d 100644 --- a/testsuite/gdk/memorytexture.c +++ b/testsuite/gdk/memorytexture.c @@ -649,6 +649,7 @@ main (int argc, char *argv[]) gsk_renderer_unrealize (gl_renderer); g_clear_object (&gl_renderer); } + gdk_gl_context_clear_current (); return result; } diff --git a/testsuite/gdk/texture-threads.c b/testsuite/gdk/texture-threads.c index 753513faaf..529e2351e6 100644 --- a/testsuite/gdk/texture-threads.c +++ b/testsuite/gdk/texture-threads.c @@ -108,6 +108,7 @@ texture_threads (void) g_clear_pointer (&loop, g_main_loop_unref); g_clear_object (&gl_renderer); g_main_context_release (NULL); + gdk_gl_context_clear_current (); } int |