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

Backed out changeset 4ad56dbf4a6f

Philipp Wiesemann 2015-06-21 19:36:35 +02:00
parent 0e45984fa0
commit 72590685c0
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/video/SDL_egl.c
View File

@ -72,7 +72,6 @@
_this->egl_data->NAME = SDL_LoadFunction(_this->egl_data->dll_handle, #NAME); \ _this->egl_data->NAME = SDL_LoadFunction(_this->egl_data->dll_handle, #NAME); \
if (!_this->egl_data->NAME) \ if (!_this->egl_data->NAME) \
{ \ { \
SDL_EGL_UnloadLibrary(_this); \
return SDL_SetError("Could not retrieve EGL function " #NAME); \ return SDL_SetError("Could not retrieve EGL function " #NAME); \
} }
@ -220,7 +219,6 @@ SDL_EGL_LoadLibrary(_THIS, const char *egl_path, NativeDisplayType native_displa
_this->egl_data->egl_dll_handle = egl_dll_handle; _this->egl_data->egl_dll_handle = egl_dll_handle;
if (egl_dll_handle == NULL) { if (egl_dll_handle == NULL) {
SDL_EGL_UnloadLibrary(_this);
return SDL_SetError("Could not initialize OpenGL / GLES library"); return SDL_SetError("Could not initialize OpenGL / GLES library");
} }
@ -242,7 +240,6 @@ SDL_EGL_LoadLibrary(_THIS, const char *egl_path, NativeDisplayType native_displa
if (dll_handle != NULL) { if (dll_handle != NULL) {
SDL_UnloadObject(dll_handle); SDL_UnloadObject(dll_handle);
} }
SDL_EGL_UnloadLibrary(_this);
return SDL_SetError("Could not load EGL library"); return SDL_SetError("Could not load EGL library");
} }
SDL_ClearError(); SDL_ClearError();
@ -272,12 +269,10 @@ SDL_EGL_LoadLibrary(_THIS, const char *egl_path, NativeDisplayType native_displa
#if !defined(__WINRT__) #if !defined(__WINRT__)
_this->egl_data->egl_display = _this->egl_data->eglGetDisplay(native_display); _this->egl_data->egl_display = _this->egl_data->eglGetDisplay(native_display);
if (!_this->egl_data->egl_display) { if (!_this->egl_data->egl_display) {
SDL_EGL_UnloadLibrary(_this);
return SDL_SetError("Could not get EGL display"); return SDL_SetError("Could not get EGL display");
} }
if (_this->egl_data->eglInitialize(_this->egl_data->egl_display, NULL, NULL) != EGL_TRUE) { if (_this->egl_data->eglInitialize(_this->egl_data->egl_display, NULL, NULL) != EGL_TRUE) {
SDL_EGL_UnloadLibrary(_this);
return SDL_SetError("Could not initialize EGL"); return SDL_SetError("Could not initialize EGL");
} }
#endif #endif