Removed EGL dlopen.

This commit is contained in:
Camilla Berglund
2013-01-04 06:59:07 +01:00
parent 2757b0fa6f
commit 7ff86576e3
5 changed files with 1 additions and 84 deletions
+1 -34
View File
@@ -359,31 +359,6 @@ static int createContext(_GLFWwindow* window,
int _glfwInitOpenGL(void)
{
#ifdef _GLFW_DLOPEN_LIBEGL
int i;
char* libEGL_names[ ] =
{
"libEGL.so",
"libEGL.so.1",
"/usr/lib/libEGL.so",
"/usr/lib/libEGL.so.1",
NULL
};
for (i = 0; libEGL_names[i] != NULL; i++)
{
_glfw.egl.libEGL = dlopen(libEGL_names[i], RTLD_LAZY | RTLD_GLOBAL);
if (_glfw.egl.libEGL)
break;
}
if (!_glfw.egl.libEGL)
{
_glfwInputError(GLFW_PLATFORM_ERROR, "EGL: Failed to find libEGL");
return GL_FALSE;
}
#endif
_glfw.egl.display = eglGetDisplay(_GLFW_EGL_NATIVE_DISPLAY);
if (_glfw.egl.display == EGL_NO_DISPLAY)
{
@@ -412,14 +387,6 @@ int _glfwInitOpenGL(void)
void _glfwTerminateOpenGL(void)
{
#ifdef _GLFW_DLOPEN_LIBEGL
if (_glfw.egl.libEGL != NULL)
{
dlclose(_glfw.egl.libEGL);
_glfw.egl.libEGL = NULL;
}
#endif
eglTerminate(_glfw.egl.display);
}
@@ -599,6 +566,6 @@ int _glfwPlatformExtensionSupported(const char* extension)
GLFWglproc _glfwPlatformGetProcAddress(const char* procname)
{
return _glfw_eglGetProcAddress(procname);
return eglGetProcAddress(procname);
}