Commit c0d86b9237ff55d1e3e05add0fdd987bf50e54be

Gabriel Jacobo 2014-01-14T21:29:38

Make EGL loading more resilient. Lesson learned while trying to run L4D2 under Wayland :)

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
diff --git a/src/video/SDL_egl.c b/src/video/SDL_egl.c
index 3731a6c..36fcac6 100644
--- a/src/video/SDL_egl.c
+++ b/src/video/SDL_egl.c
@@ -181,8 +181,8 @@ SDL_EGL_LoadLibrary(_THIS, const char *egl_path, NativeDisplayType native_displa
     if (egl_path != NULL) {
         dll_handle = SDL_LoadObject(egl_path);
     }   
-    /* Catch the case where the application isn't linked with EGL */
-    if ((SDL_LoadFunction(dll_handle, "eglChooseConfig") == NULL) && (egl_path == NULL)) {
+    /* Try loading a EGL symbol, if it does not work try the default library paths */
+    if (SDL_LoadFunction(dll_handle, "eglChooseConfig") == NULL) {
         if (dll_handle != NULL) {
             SDL_UnloadObject(dll_handle);
         }