mirror of https://github.com/encounter/SDL.git
* Remove android based workaround, it is handled in SDL_EGL_GetProcAddress.
This commit is contained in:
parent
c2b5da9733
commit
25fcc1959e
|
@ -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!");
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue