Use the gl renderer again everywhere

We're renaming ngl back to gl.

demos/node-editor/node-editor-window.c

@@ -925,7 +925,7 @@ export_image_response_cb (GObject      *source,
       GdkTexture *texture;
       GskRenderer *renderer;
 
-      renderer = gsk_ngl_renderer_new ();
+      renderer = gsk_gl_renderer_new ();
       if (!gsk_renderer_realize_for_display (renderer, gdk_display_get_default (), NULL))
         {
           g_object_unref (renderer);
@@ -1234,9 +1234,6 @@ node_editor_window_realize (GtkWidget *widget)
   node_editor_window_add_renderer (self,
                                    gsk_gl_renderer_new (),
                                    "OpenGL");
-  node_editor_window_add_renderer (self,
-                                   gsk_ngl_renderer_new (),
-                                   "NGL");
 #ifdef GDK_RENDERING_VULKAN
   node_editor_window_add_renderer (self,
                                    gsk_vulkan_renderer_new (),

gdk/gdkdmabufegl.c

@@ -231,7 +231,6 @@ gdk_dmabuf_egl_create_image (GdkDisplay      *display,
 typedef struct _GskRenderer GskRenderer;
 
 extern GskRenderer *   gsk_gl_renderer_new                      (void);
-extern GskRenderer *   gsk_ngl_renderer_new                     (void);
 extern gboolean        gsk_renderer_realize_for_display         (GskRenderer  *renderer,
                                                                  GdkDisplay   *display,
                                                                  GError      **error);
@@ -275,7 +274,7 @@ gdk_dmabuf_egl_init (GdkDisplay *display)
       return;
     }
 
-  renderer = gsk_ngl_renderer_new ();
+  renderer = gsk_gl_renderer_new ();
 
   if (!gsk_renderer_realize_for_display (renderer, display, &error))
     {

gsk/gpu/gsknglrenderer.c

@@ -195,3 +195,5 @@ gsk_ngl_renderer_new (void)
 {
   return g_object_new (GSK_TYPE_NGL_RENDERER, NULL);
 }
+
+

gsk/gskrendernodeimpl.c

@@ -8160,7 +8160,7 @@ gsk_render_node_png_serializer (GdkContentSerializer *serializer)
 
   node = gsk_value_get_render_node (gdk_content_serializer_get_value (serializer));
 
-  renderer = gsk_ngl_renderer_new ();
+  renderer = gsk_gl_renderer_new ();
   if (!gsk_renderer_realize (renderer, NULL, NULL))
     {
       g_object_unref (renderer);

testsuite/gdk/memorytexture.c

@@ -685,7 +685,7 @@ main (int argc, char *argv[])
       g_clear_object (&gl_context);
     }
 
-  gl_renderer = gsk_ngl_renderer_new ();
+  gl_renderer = gsk_gl_renderer_new ();
   if (!gsk_renderer_realize_for_display (gl_renderer, display, NULL))
     {
       g_clear_object (&gl_renderer);

testsuite/gdk/texture-threads.c

@@ -64,7 +64,7 @@ texture_threads (void)
   GError *error = NULL;
 
   /* 1. Get a GL renderer */
-  gl_renderer = gsk_ngl_renderer_new ();
+  gl_renderer = gsk_gl_renderer_new ();
   if (!gsk_renderer_realize_for_display (gl_renderer, gdk_display_get_default (), &error))
     {
       g_test_skip (error->message);

testsuite/gsk/misc.c

@@ -203,12 +203,12 @@ test_cairo_renderer (void)
 }
 
 static void
-test_ngl_renderer (void)
+test_gl_renderer (void)
 {
 #ifdef GDK_RENDERING_GL
   GskRenderer *renderer;
 
-  renderer = gsk_ngl_renderer_new ();
+  renderer = gsk_gl_renderer_new ();
   test_renderer (renderer);
   g_clear_object (&renderer);
 #else
@@ -242,7 +242,7 @@ main (int argc, char *argv[])
   g_test_add_func ("/rendernode/conic-gradient/angle", test_conic_gradient_angle);
   g_test_add_func ("/rendernode/container/disjoint", test_container_disjoint);
   g_test_add_func ("/renderer/cairo", test_cairo_renderer);
-  g_test_add_func ("/renderer/ngl", test_ngl_renderer);
+  g_test_add_func ("/renderer/gl", test_gl_renderer);
   g_test_add_func ("/renderer/vulkan", test_vulkan_renderer);
 
   return g_test_run ();

testsuite/gsk/normalize.c

@@ -6,7 +6,7 @@ static void
 test_normalize (GskRenderNode *node1,
                 GskRenderNode *node2)
 {
-  GskRenderer *renderer = gsk_ngl_renderer_new ();
+  GskRenderer *renderer = gsk_gl_renderer_new ();
   graphene_rect_t bounds1, bounds2;
   GdkTexture *texture1, *texture2, *diff;
   GError *error = NULL;

testsuite/gsk/scaling.c

@@ -10,13 +10,6 @@ struct {
   GskRenderer * (*create_func) (void);
   GskRenderer *renderer;
 } renderers[] = {
-#if 0
-  /* The GL renderer is broken, no idea why. It's suppsoed to work. */
-  {
-    "gl",
-    gsk_gl_renderer_new,
-  },
-#endif
   {
     "cairo",
     gsk_cairo_renderer_new,
@@ -26,8 +19,8 @@ struct {
     gsk_vulkan_renderer_new,
   },
   {
-    "ngl",
-    gsk_ngl_renderer_new,
+    "gl",
+    gsk_gl_renderer_new,
   },
 };
 

tools/gtk-rendernode-tool-benchmark.c

@@ -137,7 +137,7 @@ do_benchmark (int          *argc,
     }
 
   if (renderers == NULL || renderers[0] == NULL)
-    renderers = g_strdupv ((char **) (const char *[]) { "ngl", "vulkan", "cairo", NULL });
+    renderers = g_strdupv ((char **) (const char *[]) { "gl", "vulkan", "cairo", NULL });
   
   node = load_node_file (filenames[0]);
 

tools/gtk-rendernode-tool-utils.c

@@ -89,8 +89,8 @@ get_renderer_for_name (const char *renderer_name)
 #endif
   else if (g_ascii_strcasecmp (renderer_name, "cairo") == 0)
     return gsk_cairo_renderer_new ();
-  else if (g_ascii_strcasecmp (renderer_name, "ngl") == 0)
-    return gsk_ngl_renderer_new ();
+  else if (g_ascii_strcasecmp (renderer_name, "gl") == 0)
+    return gsk_gl_renderer_new ();
 #ifdef GDK_RENDERING_VULKAN
   else if (g_ascii_strcasecmp (renderer_name, "vulkan") == 0)
     return gsk_vulkan_renderer_new ();