summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYaroslav Isakov <yaroslav.isakov@gmail.com>2020-07-29 22:29:50 +0200
committerEmmanuele Bassi <ebassi@gnome.org>2021-01-20 12:23:43 +0000
commit4994c48172e94ca81c000597e0abc0ea0e682b3c (patch)
tree193dfe4553a43130b6fb881a661212f9ecb61b55
parentdbfa4b209c0712b67dfeb8366c2ebe8503063b52 (diff)
downloadlibepoxy-4994c48172e94ca81c000597e0abc0ea0e682b3c.tar.gz
Do not overwrite glx_handle in epoxy_load_gl if GLX library is loaded alreadypull-229-alt
Reviewed-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Emmanuele Bassi <ebassi@gnome.org>
-rw-r--r--src/dispatch_common.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/dispatch_common.c b/src/dispatch_common.c
index cfc9dcc..62b7134 100644
--- a/src/dispatch_common.c
+++ b/src/dispatch_common.c
@@ -677,7 +677,8 @@ epoxy_load_gl(void)
if (!api.gl_handle) {
get_dlopen_handle(&api.gl_handle, GLX_LIB, true, true);
#if PLATFORM_HAS_GLX
- api.glx_handle = api.gl_handle;
+ if (!api.glx_handle)
+ api.glx_handle = api.gl_handle;
#endif
}
#endif