Commit 13433c4a61356381aa2ee0f08858753e87d85dd1
2017-01-27T21:23:27
Fixed bug 3569 - GL_UpdateViewport leaves PROJECTION matrix selected Tom Seddon GL_ActivateRenderer may call GL_UpdateViewport, which leaves the GL_PROJECTION matrix selected. But after GL_ResetState, the GL_MODELVIEW matrix is selected, suggesting that's the intended default state. It seems at least like these should be consistent. Presumably GL_UpdateViewport should be doing a glMatrixMode(GL_MODELVIEW) before it finishes.
diff --git a/src/render/opengl/SDL_render_gl.c b/src/render/opengl/SDL_render_gl.c
index f9b05e8..74fd592 100644
--- a/src/render/opengl/SDL_render_gl.c
+++ b/src/render/opengl/SDL_render_gl.c
@@ -1041,6 +1041,8 @@ GL_UpdateViewport(SDL_Renderer * renderer)
0.0, 1.0);
}
}
+ data->glMatrixMode(GL_MODELVIEW);
+
return GL_CheckError("", renderer);
}
diff --git a/src/render/opengles/SDL_render_gles.c b/src/render/opengles/SDL_render_gles.c
index 86fb8c5..474583b 100644
--- a/src/render/opengles/SDL_render_gles.c
+++ b/src/render/opengles/SDL_render_gles.c
@@ -692,6 +692,8 @@ GLES_UpdateViewport(SDL_Renderer * renderer)
0.0, 1.0);
}
}
+ data->glMatrixMode(GL_MODELVIEW);
+
return 0;
}