From 7ed5811db38f3547f8eec3d3b577dae38405b1e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Wed, 5 Dec 2012 10:41:01 +0700 Subject: [PATCH] Restore a few missing pieces of glstate. Cleanup. --- base/PCMain.cpp | 1 - gfx_es2/gl_state.cpp | 6 +++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/base/PCMain.cpp b/base/PCMain.cpp index 97febbc00e..808c3fcb2f 100644 --- a/base/PCMain.cpp +++ b/base/PCMain.cpp @@ -218,7 +218,6 @@ int main(int argc, char *argv[]) { SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 24); SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1); SDL_GL_SetAttribute(SDL_GL_STENCIL_SIZE, 8); - SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 24); SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1); SDL_GL_SetAttribute(SDL_GL_SWAP_CONTROL, 1); diff --git a/gfx_es2/gl_state.cpp b/gfx_es2/gl_state.cpp index f46352bcf4..e3dfcb5ce4 100644 --- a/gfx_es2/gl_state.cpp +++ b/gfx_es2/gl_state.cpp @@ -14,11 +14,15 @@ void OpenGLState::Restore() { blend.restore(); blendEquation.restore(); blendFunc.restore(); + blendColor.restore(); + + scissorTest.restore(); cullFace.restore(); cullFaceMode.restore(); + frontFace.restore(); depthTest.restore(); depthRange.restore(); depthFunc.restore(); -} \ No newline at end of file +}