[gtk/wip/otte/gleanup: 5/12] x11: Reorder code



commit 34f890455bc2287a4d453ea2407c62ee6a73f0f2
Author: Benjamin Otte <otte redhat com>
Date:   Thu Jun 3 05:02:15 2021 +0200

    x11: Reorder code
    
    Initialize the GL visuals from gdkdisplay.c so the call into the GL
    stack isn't hidden in gdkvisual.c
    
    This is relevant for further commits.

 gdk/x11/gdkdisplay-x11.c | 6 ++++++
 gdk/x11/gdkvisual-x11.c  | 6 ------
 2 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c
index fd1feb758c..ae7a87c9a0 100644
--- a/gdk/x11/gdkdisplay-x11.c
+++ b/gdk/x11/gdkdisplay-x11.c
@@ -1406,6 +1406,12 @@ gdk_x11_display_open (const char *display_name)
   /* initialize the display's screens */ 
   display_x11->screen = _gdk_x11_screen_new (display, DefaultScreen (display_x11->xdisplay));
 
+  /* If GL is available we want to pick better default/rgba visuals,
+   * as we care about GLX details such as alpha/depth/stencil depth,
+   * stereo and double buffering
+   */
+  gdk_x11_screen_update_visuals_for_glx (display_x11->screen);
+
   if (display_x11->screen->rgba_visual)
     {
       Visual *xvisual = GDK_X11_VISUAL (display_x11->screen->rgba_visual)->xvisual;
diff --git a/gdk/x11/gdkvisual-x11.c b/gdk/x11/gdkvisual-x11.c
index ceeaec47c8..c97913ad1f 100644
--- a/gdk/x11/gdkvisual-x11.c
+++ b/gdk/x11/gdkvisual-x11.c
@@ -212,12 +212,6 @@ _gdk_x11_screen_init_visuals (GdkX11Screen *x11_screen)
 
   x11_screen->visuals = visuals;
   x11_screen->nvisuals = nvisuals;
-
-  /* If GL is available we want to pick better default/rgba visuals,
-   * as we care about GLX details such as alpha/depth/stencil depth,
-   * stereo and double buffering
-   */
-  gdk_x11_screen_update_visuals_for_glx (x11_screen);
 }
 
 /*< private >


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]