Skip to content
Permalink
Browse files

* Remove android based workaround, it is handled in SDL_EGL_GetProcAd…

…dress.
  • Loading branch information
BrandonSchaefer committed Feb 4, 2014
1 parent c2b5da9 commit 25fcc1959ef67a87367ef3f3570d587b4700cb13
Showing with 0 additions and 34 deletions.
  1. +0 −34 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,41 +77,13 @@ 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*
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!");
}

0 comments on commit 25fcc19

Please sign in to comment.