summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmmanuele Bassi <ebassi@gnome.org>2017-02-16 00:04:50 +0000
committerEmmanuele Bassi <ebassi@gnome.org>2018-04-23 09:13:41 +0100
commit07124b5e99a866f34f829d1b629a933f132d4c69 (patch)
tree28858702ce971044f33af67014d6958b4d9eafad
parentba883b55ee200e6b0ee041e4d014f880f946512a (diff)
downloadgtk+-07124b5e99a866f34f829d1b629a933f132d4c69.tar.gz
x11: Query whether we have GLX support
Epoxy 1.4 has new ad hoc API that we can use to check whether GLX is available on the current system. If we didn't use this API, we'd have to manually dlopen libGL (or its equivalent on different OSes) and check if it had GLX symbols; since Epoxy already does all of this internally, we can simply ask it instead. https://bugzilla.gnome.org/show_bug.cgi?id=775279 (cherry picked from commit 02eb344950547c66a9096094f271b98e94614fcb) Signed-off-by: Emmanuele Bassi <ebassi@gnome.org>
-rw-r--r--gdk/x11/gdkglcontext-x11.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/gdk/x11/gdkglcontext-x11.c b/gdk/x11/gdkglcontext-x11.c
index 0819f89648..821ef965d0 100644
--- a/gdk/x11/gdkglcontext-x11.c
+++ b/gdk/x11/gdkglcontext-x11.c
@@ -856,6 +856,9 @@ gdk_x11_screen_init_gl (GdkScreen *screen)
dpy = gdk_x11_display_get_xdisplay (display);
+ if (!epoxy_has_glx (dpy))
+ return FALSE;
+
if (!glXQueryExtension (dpy, &error_base, &event_base))
return FALSE;