Commit 1725937a authored by Sam Lantinga's avatar Sam Lantinga

Reverted revision 3416, fixing bug #589

http://bugzilla.libsdl.org/show_bug.cgi?id=589

I was going to add the current window to the OpenGL context info, but that
doesn't fix the case where you set the current context to NULL and then set
the current context to the same window it had before.

This also doesn't take into account changes to the window that might affect
the context, such as viewport changing or fullscreen/windowed mode changing.

Any ideas?

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402759
parent e8f12216
...@@ -127,7 +127,6 @@ struct SDL_Window ...@@ -127,7 +127,6 @@ struct SDL_Window
int display; int display;
SDL_Renderer *renderer; SDL_Renderer *renderer;
SDL_GLContext context;
void *userdata; void *userdata;
void *driverdata; void *driverdata;
......
...@@ -2525,12 +2525,6 @@ SDL_GL_MakeCurrent(SDL_WindowID windowID, SDL_GLContext context) ...@@ -2525,12 +2525,6 @@ SDL_GL_MakeCurrent(SDL_WindowID windowID, SDL_GLContext context)
if (!context) { if (!context) {
window = NULL; window = NULL;
} }
if (window) {
if (window->context == context) {
return 0;
}
window->context = context;
}
return _this->GL_MakeCurrent(_this, window, context); return _this->GL_MakeCurrent(_this, window, context);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment