From e2c8b7fa6c3f13439b1bbc990c763e8778db3bec Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Sun, 7 Jan 2024 10:07:48 +0100 Subject: [PATCH] testsuite: Use gsk_renderer_realize_for_display() ... in all the places where we used realize (NULL) before. --- testsuite/gdk/memorytexture.c | 11 +++++++---- testsuite/gdk/texture-threads.c | 2 +- testsuite/gsk/scaling.c | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/testsuite/gdk/memorytexture.c b/testsuite/gdk/memorytexture.c index afbd243995..738a0da57d 100644 --- a/testsuite/gdk/memorytexture.c +++ b/testsuite/gdk/memorytexture.c @@ -1453,6 +1453,7 @@ add_conversion_test (const char *name, int main (int argc, char *argv[]) { + GdkDisplay *display; int result; gtk_test_init (&argc, &argv, NULL); @@ -1462,26 +1463,28 @@ main (int argc, char *argv[]) add_conversion_test ("/memorytexture/conversion_1x1", test_conversion_1x1); add_conversion_test ("/memorytexture/conversion_random", test_conversion_random); - gl_context = gdk_display_create_gl_context (gdk_display_get_default (), NULL); + display = gdk_display_get_default (); + + gl_context = gdk_display_create_gl_context (display, NULL); if (gl_context == NULL || !gdk_gl_context_realize (gl_context, NULL)) { g_clear_object (&gl_context); } gl_renderer = gsk_gl_renderer_new (); - if (!gsk_renderer_realize (gl_renderer, NULL, NULL)) + if (!gsk_renderer_realize_for_display (gl_renderer, display, NULL)) { g_clear_object (&gl_renderer); } ngl_renderer = gsk_ngl_renderer_new (); - if (!gsk_renderer_realize (ngl_renderer, NULL, NULL)) + if (!gsk_renderer_realize_for_display (ngl_renderer, display, NULL)) { g_clear_object (&ngl_renderer); } vulkan_renderer = gsk_vulkan_renderer_new (); - if (!gsk_renderer_realize (vulkan_renderer, NULL, NULL)) + if (!gsk_renderer_realize_for_display (vulkan_renderer, display, NULL)) { g_clear_object (&vulkan_renderer); } diff --git a/testsuite/gdk/texture-threads.c b/testsuite/gdk/texture-threads.c index 529e2351e6..40ef8eaba8 100644 --- a/testsuite/gdk/texture-threads.c +++ b/testsuite/gdk/texture-threads.c @@ -67,7 +67,7 @@ texture_threads (void) /* 1. Get a GL renderer */ gl_renderer = gsk_gl_renderer_new (); - if (!gsk_renderer_realize (gl_renderer, NULL, &error)) + if (!gsk_renderer_realize_for_display (gl_renderer, gdk_display_get_default (), &error)) { g_test_skip (error->message); diff --git a/testsuite/gsk/scaling.c b/testsuite/gsk/scaling.c index b73b413840..698a5e7f56 100644 --- a/testsuite/gsk/scaling.c +++ b/testsuite/gsk/scaling.c @@ -1046,7 +1046,7 @@ create_renderers (void) for (i = 0; i < G_N_ELEMENTS (renderers); i++) { renderers[i].renderer = renderers[i].create_func (); - if (!gsk_renderer_realize (renderers[i].renderer, NULL, &error)) + if (!gsk_renderer_realize_for_display (renderers[i].renderer, gdk_display_get_default (), &error)) { g_test_message ("Could not realize %s renderer: %s", renderers[i].name, error->message); g_clear_error (&error);