diff options
| author | Emmanuele Bassi <ebassi@gmail.com> | 2021-05-21 16:51:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-21 16:51:50 +0100 |
| commit | 2a1665c632d47c2c73f4e8e1d2f2db62b26682d2 (patch) | |
| tree | 31f33dee970cf180c1c2fbbfb0d2a6264f9d4ae5 | |
| parent | 0dd0e0a27290a110979fd47a2c517caa7fec4a0f (diff) | |
| parent | 622ca393c38a92e2fac9f877bbcf65f97782d206 (diff) | |
| download | libepoxy-2a1665c632d47c2c73f4e8e1d2f2db62b26682d2.tar.gz | |
Merge pull request #254 from anholt/issue-252
Revert OpenGL/GLX loading changes
| -rw-r--r-- | src/dispatch_common.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/dispatch_common.c b/src/dispatch_common.c index 62b7134..9977a02 100644 --- a/src/dispatch_common.c +++ b/src/dispatch_common.c @@ -674,13 +674,9 @@ epoxy_load_gl(void) if (!api.gl_handle) get_dlopen_handle(&api.gl_handle, OPENGL_LIB, false, true); #endif - if (!api.gl_handle) { - get_dlopen_handle(&api.gl_handle, GLX_LIB, true, true); -#if PLATFORM_HAS_GLX - if (!api.glx_handle) - api.glx_handle = api.gl_handle; -#endif - } + + get_dlopen_handle(&api.glx_handle, GLX_LIB, true, true); + api.gl_handle = api.glx_handle; #endif } |