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

Don't try to clear errors in GL_ActivateRenderer() before we MakeCurrent.

Browse source 
Otherwise, if we destroyed a different renderer, next time this one draws,
it'll clear errors forever (GL_INVALID_OPERATION for having no current
context, at least on Windows), hanging up the program in an infinite loop.

Fixes Bugzilla #1775.
This commit is contained in:
Ryan C. Gordon 2013-07-20 21:10:05 -04:00
parent f2029f2af8
commit 51ba788d0d
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/render/opengl/SDL_render_gl.c
View file

@ -277,7 +277,6 @@ GL_ActivateRenderer(SDL_Renderer * renderer)
{
GL_RenderData *data = (GL_RenderData *) renderer->driverdata;
GL_ClearErrors(renderer);
if (SDL_CurrentContext != data->context) {
if (SDL_GL_MakeCurrent(renderer->window, data->context) < 0) {
return -1;
@ -286,6 +285,9 @@ GL_ActivateRenderer(SDL_Renderer * renderer)
GL_UpdateViewport(renderer);
}
GL_ClearErrors(renderer);
return 0;
}