Timo Aaltonen pushed to branch upstream-unstable at X Strike Force / lib / libepoxy
Commits:
-
0dd0e0a2
by Emmanuele Bassi at 2021-04-30T13:17:59+01:00
-
c2148eb0
by Emmanuele Bassi at 2021-05-21T15:35:35+01:00
-
622ca393
by Emmanuele Bassi at 2021-05-21T15:35:41+01:00
-
2a1665c6
by Emmanuele Bassi at 2021-05-21T16:51:50+01:00
2 changed files:
Changes:
1 |
-project('libepoxy', 'c', version: '1.5.7',
|
|
1 |
+project('libepoxy', 'c', version: '1.5.8',
|
|
2 | 2 |
default_options: [
|
3 | 3 |
'buildtype=debugoptimized',
|
4 | 4 |
'c_std=gnu99',
|
... | ... | @@ -674,13 +674,9 @@ epoxy_load_gl(void) |
674 | 674 |
if (!api.gl_handle)
|
675 | 675 |
get_dlopen_handle(&api.gl_handle, OPENGL_LIB, false, true);
|
676 | 676 |
#endif
|
677 |
- if (!api.gl_handle) {
|
|
678 |
- get_dlopen_handle(&api.gl_handle, GLX_LIB, true, true);
|
|
679 |
-#if PLATFORM_HAS_GLX
|
|
680 |
- if (!api.glx_handle)
|
|
681 |
- api.glx_handle = api.gl_handle;
|
|
682 |
-#endif
|
|
683 |
- }
|
|
677 |
+ |
|
678 |
+ get_dlopen_handle(&api.glx_handle, GLX_LIB, true, true);
|
|
679 |
+ api.gl_handle = api.glx_handle;
|
|
684 | 680 |
#endif
|
685 | 681 |
}
|
686 | 682 |
|