encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Sylvain Becker 2019-10-18 14:08:07 +02:00
parent 03f27a3a75
commit e5bd20030d
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/video/SDL_egl.c
View File

@ -227,12 +227,10 @@ SDL_EGL_GetProcAddress(_THIS, const char *proc)
void *retval = NULL; void *retval = NULL;
/* eglGetProcAddress is busted on Android http://code.google.com/p/android/issues/detail?id=7681 */ /* 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. */ /* 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) { if (!retval && is_egl_15_or_later && _this->egl_data->eglGetProcAddress) {
retval = _this->egl_data->eglGetProcAddress(proc); retval = _this->egl_data->eglGetProcAddress(proc);
} }
#endif
/* Try SDL_LoadFunction() first for EGL <= 1.4, or as a fallback for >= 1.5. */ /* Try SDL_LoadFunction() first for EGL <= 1.4, or as a fallback for >= 1.5. */
if (!retval) { 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 */ /* 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... */ /* Try eglGetProcAddress if we on <= 1.4 and still searching... */
if (!retval && !is_egl_15_or_later && _this->egl_data->eglGetProcAddress) { if (!retval && !is_egl_15_or_later && _this->egl_data->eglGetProcAddress) {
retval = _this->egl_data->eglGetProcAddress(proc); retval = _this->egl_data->eglGetProcAddress(proc);
@ -255,7 +252,6 @@ SDL_EGL_GetProcAddress(_THIS, const char *proc)
return retval; return retval;
} }
} }
#endif
return retval; return retval;
} }