pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More OpenGL ES fixes from Scott Percival

Browse source
This commit is contained in:
Sam Lantinga 2012-07-19 09:36:58 -07:00
parent 2a336fae73
commit 1277706b2b
3 changed files with 17 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/video/x11/SDL_x11opengl.c
View file

@ -128,9 +128,9 @@ X11_GL_LoadLibrary(_THIS, const char *path)
return -1; return -1;
} }
#if SDL_VIDEO_OPENGL_ES || SDL_VIDEO_OPENGL_ES2
/* If SDL_GL_CONTEXT_EGL has been changed to 1, switch over to X11_GLES functions */ /* If SDL_GL_CONTEXT_EGL has been changed to 1, switch over to X11_GLES functions */
if (_this->gl_config.use_egl == 1) { if (_this->gl_config.use_egl == 1) {
#if SDL_VIDEO_OPENGL_ES || SDL_VIDEO_OPENGL_ES2
_this->GL_LoadLibrary = X11_GLES_LoadLibrary; _this->GL_LoadLibrary = X11_GLES_LoadLibrary;
_this->GL_GetProcAddress = X11_GLES_GetProcAddress; _this->GL_GetProcAddress = X11_GLES_GetProcAddress;
_this->GL_UnloadLibrary = X11_GLES_UnloadLibrary; _this->GL_UnloadLibrary = X11_GLES_UnloadLibrary;
@ -141,8 +141,11 @@ X11_GL_LoadLibrary(_THIS, const char *path)
_this->GL_SwapWindow = X11_GLES_SwapWindow; _this->GL_SwapWindow = X11_GLES_SwapWindow;
_this->GL_DeleteContext = X11_GLES_DeleteContext; _this->GL_DeleteContext = X11_GLES_DeleteContext;
return X11_GLES_LoadLibrary(_this, path); return X11_GLES_LoadLibrary(_this, path);
} #else
SDL_SetError("SDL not configured with OpenGL ES/EGL support");
return -1;
#endif #endif
}
/* Load the OpenGL library */ /* Load the OpenGL library */

7
src/video/x11/SDL_x11opengles.c
View file

@ -99,9 +99,9 @@ X11_GLES_LoadLibrary(_THIS, const char *path)
return -1; return -1;
} }
#if SDL_VIDEO_OPENGL_GLX
/* If SDL_GL_CONTEXT_EGL has been changed to 0, switch over to X11_GL functions */ /* If SDL_GL_CONTEXT_EGL has been changed to 0, switch over to X11_GL functions */
if (_this->gl_config.use_egl == 0) { if (_this->gl_config.use_egl == 0) {
#if SDL_VIDEO_OPENGL_GLX
_this->GL_LoadLibrary = X11_GL_LoadLibrary; _this->GL_LoadLibrary = X11_GL_LoadLibrary;
_this->GL_GetProcAddress = X11_GL_GetProcAddress; _this->GL_GetProcAddress = X11_GL_GetProcAddress;
_this->GL_UnloadLibrary = X11_GL_UnloadLibrary; _this->GL_UnloadLibrary = X11_GL_UnloadLibrary;
@ -112,8 +112,11 @@ X11_GLES_LoadLibrary(_THIS, const char *path)
_this->GL_SwapWindow = X11_GL_SwapWindow; _this->GL_SwapWindow = X11_GL_SwapWindow;
_this->GL_DeleteContext = X11_GL_DeleteContext; _this->GL_DeleteContext = X11_GL_DeleteContext;
return X11_GL_LoadLibrary(_this, path); return X11_GL_LoadLibrary(_this, path);
} #else
SDL_SetError("SDL not configured with OpenGL/GLX support");
return -1;
#endif #endif
}
#ifdef RTLD_GLOBAL #ifdef RTLD_GLOBAL
dlopen_flags = RTLD_LAZY | RTLD_GLOBAL; dlopen_flags = RTLD_LAZY | RTLD_GLOBAL;

8
src/video/x11/SDL_x11window.c
View file

@ -391,7 +391,12 @@ X11_CreateWindow(_THIS, SDL_Window * window)
return -1; return -1;
} }
#if SDL_VIDEO_OPENGL_ES || SDL_VIDEO_OPENGL_ES2 #if SDL_VIDEO_OPENGL_ES || SDL_VIDEO_OPENGL_ES2
if (window->flags & SDL_WINDOW_OPENGL) { if ((window->flags & SDL_WINDOW_OPENGL) && (_this->gl_config.use_egl == 1)) {
if (!_this->gles_data) {
XDestroyWindow(display, w);
return -1;
}
/* Create the GLES window surface */ /* Create the GLES window surface */
_this->gles_data->egl_surface = _this->gles_data->egl_surface =
_this->gles_data->eglCreateWindowSurface(_this->gles_data-> _this->gles_data->eglCreateWindowSurface(_this->gles_data->
@ -401,6 +406,7 @@ X11_CreateWindow(_THIS, SDL_Window * window)
if (_this->gles_data->egl_surface == EGL_NO_SURFACE) { if (_this->gles_data->egl_surface == EGL_NO_SURFACE) {
SDL_SetError("Could not create GLES window surface"); SDL_SetError("Could not create GLES window surface");
XDestroyWindow(display, w);
return -1; return -1;
} }
} }