From 28f0e7a48424bda9bc4127b2caca4fa984c82b16 Mon Sep 17 00:00:00 2001 From: baldurk Date: Tue, 3 Nov 2015 22:54:43 +0100 Subject: [PATCH] Clear GL errors after Fetch/Apply state * This can happen if e.g. some state we're fetching or restoring is not supported on the current GL context. --- renderdoc/driver/gl/gl_renderstate.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/renderdoc/driver/gl/gl_renderstate.cpp b/renderdoc/driver/gl/gl_renderstate.cpp index 4135cd6a1..af1be5a1f 100644 --- a/renderdoc/driver/gl/gl_renderstate.cpp +++ b/renderdoc/driver/gl/gl_renderstate.cpp @@ -792,6 +792,8 @@ void GLRenderState::FetchState(void *ctx, WrappedOpenGL *gl) m_Real->glGetIntegerv(eGL_CULL_FACE_MODE, (GLint *)&CullFace); Unpack.Fetch(m_Real, true); + + ClearGLErrors(*m_Real); } void GLRenderState::ApplyState(void *ctx, WrappedOpenGL *gl) @@ -1083,6 +1085,8 @@ void GLRenderState::ApplyState(void *ctx, WrappedOpenGL *gl) m_Real->glCullFace(CullFace); Unpack.Apply(m_Real, true); + + ClearGLErrors(*m_Real); } void GLRenderState::Clear()