renderer: Pass the display as part of the vfunc

We allow realizing renderers without surfaces. But they still need a
display, so pass it explicitly.

gsk/broadway/gskbroadwayrenderer.c

@@ -35,6 +35,7 @@ G_DEFINE_TYPE (GskBroadwayRenderer, gsk_broadway_renderer, GSK_TYPE_RENDERER)
 
 static gboolean
 gsk_broadway_renderer_realize (GskRenderer  *renderer,
+                               GdkDisplay   *display,
                                GdkSurface   *surface,
                                GError      **error)
 {

gsk/gl/gskglrenderer.c

@@ -162,6 +162,7 @@ gsk_gl_renderer_new (void)
 
 static gboolean
 gsk_gl_renderer_realize (GskRenderer  *renderer,
+                         GdkDisplay   *display,
                          GdkSurface   *surface,
                          GError      **error)
 {
@@ -169,7 +170,6 @@ gsk_gl_renderer_realize (GskRenderer  *renderer,
   GskGLRenderer *self = (GskGLRenderer *)renderer;
   GdkGLContext *context = NULL;
   GskGLDriver *driver = NULL;
-  GdkDisplay *display;
   gboolean ret = FALSE;
   gboolean debug_shaders = FALSE;
   GdkGLAPI api;
@@ -182,15 +182,9 @@ gsk_gl_renderer_realize (GskRenderer  *renderer,
   g_assert (self->command_queue == NULL);
 
   if (surface == NULL)
-    {
-      display = gdk_display_get_default (); /* FIXME: allow different displays somehow ? */
     context = gdk_display_create_gl_context (display, error);
-    }
   else
-    {
-      display = gdk_surface_get_display (surface);
     context = gdk_surface_create_gl_context (surface, error);
-    }
 
   if (!context || !gdk_gl_context_realize (context, error))
     goto failure;

gsk/gpu/gskgpurenderer.c

@@ -188,18 +188,13 @@ gsk_gpu_renderer_get_frame (GskGpuRenderer *self)
 
 static gboolean
 gsk_gpu_renderer_realize (GskRenderer  *renderer,
+                          GdkDisplay   *display,
                           GdkSurface   *surface,
                           GError      **error)
 {
   GskGpuRenderer *self = GSK_GPU_RENDERER (renderer);
   GskGpuRendererPrivate *priv = gsk_gpu_renderer_get_instance_private (self);
   GskGpuOptimizations context_optimizations;
-  GdkDisplay *display;
-
-  if (surface)
-    display = gdk_surface_get_display (surface);
-  else
-    display = gdk_display_get_default ();
 
   priv->device = GSK_GPU_RENDERER_GET_CLASS (self)->get_device (display, error);
   if (priv->device == NULL)

gsk/gskcairorenderer.c

@@ -50,6 +50,7 @@ G_DEFINE_TYPE (GskCairoRenderer, gsk_cairo_renderer, GSK_TYPE_RENDERER)
 
 static gboolean
 gsk_cairo_renderer_realize (GskRenderer  *renderer,
+                            GdkDisplay   *display,
                             GdkSurface   *surface,
                             GError      **error)
 {

gsk/gskrenderer.c

@@ -102,6 +102,7 @@ static GParamSpec *gsk_renderer_properties[N_PROPS];
 
 static gboolean
 gsk_renderer_real_realize (GskRenderer  *self,
+                           GdkDisplay   *display,
                            GdkSurface   *surface,
                            GError      **error)
 {
@@ -255,6 +256,32 @@ gsk_renderer_is_realized (GskRenderer *renderer)
   return priv->is_realized;
 }
 
+static gboolean
+gsk_renderer_do_realize (GskRenderer  *renderer,
+                         GdkDisplay   *display,
+                         GdkSurface   *surface,
+                         GError      **error)
+{
+  GskRendererPrivate *priv = gsk_renderer_get_instance_private (renderer);
+
+  if (surface)
+    priv->surface = g_object_ref (surface);
+
+  if (!GSK_RENDERER_GET_CLASS (renderer)->realize (renderer, display, surface, error))
+    {
+      g_clear_object (&priv->surface);
+      return FALSE;
+    }
+
+  priv->is_realized = TRUE;
+
+  g_object_notify (G_OBJECT (renderer), "realized");
+  if (surface)
+    g_object_notify (G_OBJECT (renderer), "surface");
+
+  return TRUE;
+}
+
 /**
  * gsk_renderer_realize:
  * @renderer: a `GskRenderer`
@@ -277,21 +304,26 @@ gsk_renderer_realize (GskRenderer  *renderer,
                       GdkSurface   *surface,
                       GError      **error)
 {
-  GskRendererPrivate *priv = gsk_renderer_get_instance_private (renderer);
-
   g_return_val_if_fail (GSK_IS_RENDERER (renderer), FALSE);
   g_return_val_if_fail (!gsk_renderer_is_realized (renderer), FALSE);
   g_return_val_if_fail (surface == NULL || GDK_IS_SURFACE (surface), FALSE);
   g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
 
-  if (surface)
+  if (surface == NULL)
-    priv->surface = g_object_ref (surface);
-
-  if (!GSK_RENDERER_GET_CLASS (renderer)->realize (renderer, surface, error))
     {
-      g_clear_object (&priv->surface);
+      return gsk_renderer_do_realize (renderer,
-      return FALSE;
+                                      gdk_display_get_default (),
+                                      NULL,
+                                      error);
     }
+  else
+    {
+      return gsk_renderer_do_realize (renderer,
+                                      gdk_surface_get_display (surface),
+                                      surface,
+                                      error);
+    }
+}
 
   priv->is_realized = TRUE;
 

gsk/gskrendererprivate.h

@@ -41,6 +41,7 @@ struct _GskRendererClass
   gboolean supports_offload;
 
   gboolean             (* realize)                              (GskRenderer            *renderer,
+                                                                 GdkDisplay             *display,
                                                                  GdkSurface             *surface,
                                                                  GError                **error);
   void                 (* unrealize)                            (GskRenderer            *renderer);