geemili
/
SDL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Remove android based workaround, it is handled in SDL_EGL_GetProcAddress.

Brandon Schaefer 2014-02-04 12:28:35 -08:00
parent c2b5da9733
commit 25fcc1959e
1 changed files with 0 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/video/mir/SDL_miropengl.c
View File

@ -29,14 +29,8 @@
#include "SDL_miropengl.h" #include "SDL_miropengl.h"
#include <dlfcn.h>
#define DEFAULT_OGL_ES2 "libGLESv2.so"
#include "SDL_mirdyn.h" #include "SDL_mirdyn.h"
void* MIR_GLHandle = NULL;
void void
MIR_GL_SwapWindow(_THIS, SDL_Window* window) MIR_GL_SwapWindow(_THIS, SDL_Window* window)
{ {
@ -83,22 +77,6 @@ void
MIR_GL_UnloadLibrary(_THIS) MIR_GL_UnloadLibrary(_THIS)
{ {
SDL_EGL_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* void*
@ -106,18 +84,6 @@ MIR_GL_GetProcAddress(_THIS, const char* proc)
{ {
void* proc_addr = SDL_EGL_GetProcAddress(_this, 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) { if (!proc_addr) {
SDL_SetError("Failed to find proc address!"); SDL_SetError("Failed to find proc address!");
} }