* Remove android based workaround, it is handled in SDL_EGL_GetProcAddress.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61
diff --git a/src/video/mir/SDL_miropengl.c b/src/video/mir/SDL_miropengl.c
index 510ad3c..976b772 100644
--- a/src/video/mir/SDL_miropengl.c
+++ b/src/video/mir/SDL_miropengl.c
@@ -29,14 +29,8 @@
#include "SDL_miropengl.h"
-#include <dlfcn.h>
-
-#define DEFAULT_OGL_ES2 "libGLESv2.so"
-
#include "SDL_mirdyn.h"
-void* MIR_GLHandle = NULL;
-
void
MIR_GL_SwapWindow(_THIS, SDL_Window* window)
{
@@ -83,22 +77,6 @@ void
MIR_GL_UnloadLibrary(_THIS)
{
SDL_EGL_UnloadLibrary(_this);
-
- if (MIR_GLHandle) {
- dlclose(MIR_GLHandle);
- MIR_GLHandle = NULL;
- }
-}
-
-void
-Ensure_GL_HandleOpen()
-{
- if (!MIR_GLHandle) {
- MIR_GLHandle = dlopen(DEFAULT_OGL_ES2, RTLD_GLOBAL);
- if (!MIR_GLHandle) {
- SDL_SetError("Failed to dlopen library.");
- }
- }
}
void*
@@ -106,18 +84,6 @@ MIR_GL_GetProcAddress(_THIS, const char* proc)
{
void* proc_addr = SDL_EGL_GetProcAddress(_this, proc);
- /* FIXME when on the phone/tablet eglGetProcAddress returns NULL through libhybris,
- seems to be a problem in android. Also looks like a problem in the android video driver:
- src/video/android/SDL_androidgl.c
-
- Workaround, to just get the address ourself
- */
-
- if (!proc_addr) {
- Ensure_GL_HandleOpen();
- proc_addr = dlsym(MIR_GLHandle, proc);
- }
-
if (!proc_addr) {
SDL_SetError("Failed to find proc address!");
}