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

Fixed bug 1946 - OpenGL contexts in threads

Browse source 
The SDL OpenGL context code is now properly thread aware.  There are two new functions which return the current OpenGL window and context for the current thread.

There are still places in the cocoa driver where the OpenGL context needs to be updated when the view changes.  These will need a different solution and still use the last globally set context to avoid changing behavior.
This commit is contained in:
Sam Lantinga 2013-07-11 22:59:20 -07:00
parent de2ec2b443
commit 35275fc714
6 changed files with 57 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -532,7 +532,7 @@ X11_GL_CreateContext(_THIS, SDL_Window * window)
GLXContext context = NULL, share_context;
if (_this->gl_config.share_with_current_context) {
share_context = (GLXContext)(_this->current_glctx);
share_context = SDL_GL_GetCurrentContext();
} else {
share_context = NULL;
}
@ -683,7 +683,7 @@ X11_GL_SetSwapInterval(_THIS, int interval)
} else if (_this->gl_data->glXSwapIntervalEXT) {
Display *display = ((SDL_VideoData *) _this->driverdata)->display;
const SDL_WindowData *windowdata = (SDL_WindowData *)
_this->current_glwin->driverdata;
SDL_GL_GetCurrentWindow()->driverdata;
Window drawable = windowdata->xwindow;
@ -727,7 +727,7 @@ X11_GL_GetSwapInterval(_THIS)
if (_this->gl_data->glXSwapIntervalEXT) {
Display *display = ((SDL_VideoData *) _this->driverdata)->display;
const SDL_WindowData *windowdata = (SDL_WindowData *)
_this->current_glwin->driverdata;
SDL_GL_GetCurrentWindow()->driverdata;
Window drawable = windowdata->xwindow;
unsigned int allow_late_swap_tearing = 0;
unsigned int interval = 0;