ngl: Store the shared driver in the display

... instead of some random GL context.

diff --git a/gsk/ngl/gskngldriver.c b/gsk/ngl/gskngldriver.c
index ec7cdf7bb753ef9401af02416ffe5100c2ecc7cd..32862047d8d9b7beea4ae526e8ddc810229d3b17 100644 (file)
--- a/gsk/ngl/gskngldriver.c
+++ b/gsk/ngl/gskngldriver.c
@@ -24,6 +24,7 @@
 #include "config.h"
 
 #include <gdk/gdkglcontextprivate.h>
+#include <gdk/gdkdisplayprivate.h>
 #include <gdk/gdktextureprivate.h>
 #include <gsk/gskdebugprivate.h>
 #include <gsk/gskglshaderprivate.h>
@@ -447,30 +448,34 @@ gsk_ngl_driver_new (GskNglCommandQueue  *command_queue,
 }
 
 /**
- * gsk_ngl_driver_from_shared_context:
- * @context: a shared `GdkGLContext` retrieved with gdk_gl_context_get_shared_context()
+ * gsk_ngl_driver_for_display:
+ * @display: A #GdkDisplay that is known to support GL
  * @debug_shaders: if debug information for shaders should be displayed
  * @error: location for error information
  *
- * Retrieves a driver for a shared context. Generally this is shared across all GL
+ * Retrieves a driver for a shared display. Generally this is shared across all GL
  * contexts for a display so that fewer programs are necessary for driving output.
  *
  * Returns: (transfer full): a `GskNglDriver` if successful; otherwise %NULL and
  *   @error is set.
  */
 GskNglDriver *
-gsk_ngl_driver_from_shared_context (GdkGLContext  *context,
-                                    gboolean       debug_shaders,
-                                    GError       **error)
+gsk_ngl_driver_for_display (GdkDisplay  *display,
+                            gboolean     debug_shaders,
+                            GError     **error)
 {
+  GdkGLContext *context;
   GskNglCommandQueue *command_queue = NULL;
   GskNglDriver *driver;
 
-  g_return_val_if_fail (GDK_IS_GL_CONTEXT (context), NULL);
+  g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
 
-  if ((driver = g_object_get_data (G_OBJECT (context), "GSK_NGL_DRIVER")))
+  if ((driver = g_object_get_data (G_OBJECT (display), "GSK_NGL_DRIVER")))
     return g_object_ref (driver);
 
+  context = gdk_display_get_gl_context (display);
+  g_assert (context);
+
   gdk_gl_context_make_current (context);
 
   /* Initially we create a command queue using the shared context. However,
@@ -484,7 +489,7 @@ gsk_ngl_driver_from_shared_context (GdkGLContext  *context,
   if (!(driver = gsk_ngl_driver_new (command_queue, debug_shaders, error)))
     goto failure;
 
-  g_object_set_data_full (G_OBJECT (context),
+  g_object_set_data_full (G_OBJECT (display),
                           "GSK_NGL_DRIVER",
                           g_object_ref (driver),
                           g_object_unref);

diff --git a/gsk/ngl/gskngldriverprivate.h b/gsk/ngl/gskngldriverprivate.h
index b0b5f7f550ca074dfee903f5a1150bc38e8376b1..b5b5e60600d1fa60e8afe9ff482ba7eb36a25597 100644 (file)
--- a/gsk/ngl/gskngldriverprivate.h
+++ b/gsk/ngl/gskngldriverprivate.h
@@ -136,7 +136,7 @@ struct _GskNglDriver
   guint in_frame : 1;
 };
 
-GskNglDriver       *gsk_ngl_driver_from_shared_context    (GdkGLContext         *context,
+GskNglDriver       *gsk_ngl_driver_for_display            (GdkDisplay           *display,
                                                            gboolean              debug_shaders,
                                                            GError              **error);
 GskNglCommandQueue *gsk_ngl_driver_create_command_queue   (GskNglDriver         *self,

diff --git a/gsk/ngl/gsknglrenderer.c b/gsk/ngl/gsknglrenderer.c
index c84f11204750d944d9b212803819fd4d33d3a6c1..fa393c11cf81c1cdcfd79e491cb0b7089a6b64d2 100644 (file)
--- a/gsk/ngl/gsknglrenderer.c
+++ b/gsk/ngl/gsknglrenderer.c
@@ -86,7 +86,6 @@ gsk_ngl_renderer_realize (GskRenderer  *renderer,
   G_GNUC_UNUSED gint64 start_time = GDK_PROFILER_CURRENT_TIME;
   GskNglRenderer *self = (GskNglRenderer *)renderer;
   GdkGLContext *context = NULL;
-  GdkGLContext *shared_context;
   GskNglDriver *driver = NULL;
   gboolean ret = FALSE;
   gboolean debug_shaders = FALSE;
@@ -105,21 +104,12 @@ gsk_ngl_renderer_realize (GskRenderer  *renderer,
       !gdk_gl_context_realize (context, error))
     goto failure;
 
-  if (!(shared_context = gdk_display_get_gl_context (gdk_surface_get_display (surface))))
-    {
-      g_set_error (error,
-                   GDK_GL_ERROR,
-                   GDK_GL_ERROR_NOT_AVAILABLE,
-                   "Failed to locate shared GL context for driver");
-      goto failure;
-    }
-
 #ifdef G_ENABLE_DEBUG
   if (GSK_RENDERER_DEBUG_CHECK (GSK_RENDERER (self), SHADERS))
     debug_shaders = TRUE;
 #endif
 
-  if (!(driver = gsk_ngl_driver_from_shared_context (shared_context, debug_shaders, error)))
+  if (!(driver = gsk_ngl_driver_for_display (gdk_surface_get_display (surface), debug_shaders, error)))
     goto failure;
 
   self->command_queue = gsk_ngl_driver_create_command_queue (driver, context);