Leahnaya/SDL
1
0
Fork 0
mirror of https://github.com/yawut/SDL.git synced 2026-09-13 19:45:57 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Turn SDL_GL_MakeCurrent() into a no-op if setting the same context twice.

Browse Source
This commit is contained in:
Ryan C. Gordon
2011-07-15 17:05:32 -07:00
parent 9a3d27d57c
commit 36c9edd0e8
2 changed files with 28 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/video/SDL_sysvideo.h
View File

@@ -276,6 +276,11 @@ struct SDL_VideoDevice
void *dll_handle;
} gl_config;
/* * * */
/* Cache current GL context; don't call the OS when it hasn't changed. */
SDL_Window *current_glwin;
SDL_GLContext current_glctx;
/* * * */
/* Data private to this driver */
void *driverdata;

26
src/video/SDL_video.c
View File

@@ -1931,6 +1931,13 @@ SDL_DestroyWindow(SDL_Window * window)
CHECK_WINDOW_MAGIC(window, );
/* make no context current if this is the current context window. */
if (window->flags & SDL_WINDOW_OPENGL) {
if (_this->current_glwin == window) {
SDL_GL_MakeCurrent(NULL, NULL);
}
}
/* Restore video mode, etc. */
SDL_HideWindow(window);
@@ -2462,18 +2469,31 @@ SDL_GL_CreateContext(SDL_Window * window)
}
int
SDL_GL_MakeCurrent(SDL_Window * window, SDL_GLContext context)
SDL_GL_MakeCurrent(SDL_Window * window, SDL_GLContext ctx)
{
int retval;
CHECK_WINDOW_MAGIC(window, -1);
if (!(window->flags & SDL_WINDOW_OPENGL)) {
SDL_SetError("The specified window isn't an OpenGL window");
return -1;
}
if (!context) {
if (!ctx) {
window = NULL;
}
return _this->GL_MakeCurrent(_this, window, context);
if ((window == _this->current_glwin) && (ctx == _this->current_glctx)) {
retval = 0; /* we're already current. */
} else {
retval = _this->GL_MakeCurrent(_this, window, ctx);
if (retval == 0) {
_this->current_glwin = window;
_this->current_glctx = ctx;
}
}
return retval;
}
int