Commit e5bd20030d1bb177e1848d2de9e6f887c470d29b

Sylvain Becker 2019-10-18T14:08:07

Android: enable eglGetProcAddress (bug #4040, bug #4794)

diff --git a/src/video/SDL_egl.c b/src/video/SDL_egl.c
index 6420608..1c704f7 100644
--- a/src/video/SDL_egl.c
+++ b/src/video/SDL_egl.c
@@ -227,12 +227,10 @@ SDL_EGL_GetProcAddress(_THIS, const char *proc)
     void *retval = NULL;
 
     /* eglGetProcAddress is busted on Android http://code.google.com/p/android/issues/detail?id=7681 */
-#if !defined(SDL_VIDEO_DRIVER_ANDROID)
     /* EGL 1.5 can use eglGetProcAddress() for any symbol. 1.4 and earlier can't use it for core entry points. */
     if (!retval && is_egl_15_or_later && _this->egl_data->eglGetProcAddress) {
         retval = _this->egl_data->eglGetProcAddress(proc);
     }
-#endif
 
     /* Try SDL_LoadFunction() first for EGL <= 1.4, or as a fallback for >= 1.5. */
     if (!retval) {
@@ -247,7 +245,6 @@ SDL_EGL_GetProcAddress(_THIS, const char *proc)
     }
 
     /* eglGetProcAddress is busted on Android http://code.google.com/p/android/issues/detail?id=7681 */
-#if !defined(SDL_VIDEO_DRIVER_ANDROID)
     /* Try eglGetProcAddress if we on <= 1.4 and still searching... */
     if (!retval && !is_egl_15_or_later && _this->egl_data->eglGetProcAddress) {
         retval = _this->egl_data->eglGetProcAddress(proc);
@@ -255,7 +252,6 @@ SDL_EGL_GetProcAddress(_THIS, const char *proc)
             return retval;
         }
     }
-#endif
 
     return retval;
 }