AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

glx: Don't initialize GLX multiple times.

Browse Source 
Either it is initialized or it isn't.
This commit is contained in:
Benjamin Otte 2021-06-06 17:14:31 +02:00
parent 0fce30070f
commit 8dfc627e46
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gdk/x11/gdkglcontext-egl.c
View File

@ -805,10 +805,7 @@ gdk_x11_display_get_egl_version (GdkDisplay *display,
GdkX11Display *display_x11 = GDK_X11_DISPLAY (display);
if (display_x11->have_glx)
return FALSE;
if (!gdk_x11_screen_init_egl (display_x11->screen))
if (!display_x11->have_egl)
return FALSE;
if (major != NULL)

7
gdk/x11/gdkglcontext-glx.c
View File

@ -1019,7 +1019,7 @@ gdk_x11_screen_update_visuals_for_glx (GdkX11Screen *x11_screen)
display_x11 = GDK_X11_DISPLAY (display);
dpy = gdk_x11_display_get_xdisplay (display);
if (display_x11->have_egl)
if (!display_x11->have_glx)
return;
/* We save the default visuals as a property on the root window to avoid
@ -1040,9 +1040,6 @@ gdk_x11_screen_update_visuals_for_glx (GdkX11Screen *x11_screen)
}
}
if (!gdk_x11_screen_init_glx (x11_screen))
return;
gl_info = g_new0 (struct glvisualinfo, x11_screen->nvisuals);
for (i = 0; i < x11_screen->nvisuals; i++)
@ -1194,7 +1191,7 @@ gdk_x11_display_get_glx_version (GdkDisplay *display,
GdkX11Display *display_x11 = GDK_X11_DISPLAY (display);
if (!gdk_x11_screen_init_glx (display_x11->screen))
if (!display_x11->have_glx)
return FALSE;
if (major != NULL)