lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-29 21:30:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix state push/pop not being quite right on GL

Browse Source
This commit is contained in:
baldurk
2019-12-11 16:45:21 +00:00
parent 6fa54ce342
commit 0659c7338f
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/gl/gl_common.cpp
+5 -4
View File
@@ -944,7 +944,7 @@ void GLPushPopState::Push(bool modern)
GL.glGetIntegerv(eGL_ARRAY_BUFFER_BINDING, (GLint *)&arraybuf);
// we get the current program but only try to restore it if it's non-0
prog = 0;
prog = 0xDEADBEEF;
if(modern)
GL.glGetIntegerv(eGL_CURRENT_PROGRAM, (GLint *)&prog);
@@ -953,7 +953,7 @@ void GLPushPopState::Push(bool modern)
// since we will use the fixed function pipeline, also need to check for program pipeline
// bindings (if we weren't, our program would override)
pipe = 0;
pipe = 0xDEADBEEF;
if(modern && HasExt[ARB_separate_shader_objects])
GL.glGetIntegerv(eGL_PROGRAM_PIPELINE_BINDING, (GLint *)&pipe);
@@ -1116,15 +1116,16 @@ void GLPushPopState::Pop(bool modern)
GL.glBindBuffer(eGL_UNIFORM_BUFFER, ubo);
GL.glUseProgram(prog);
GL.glBindProgramPipeline(pipe);
GL.glBindVertexArray(VAO);
}
else
{
// only restore these if there was a setting and the function pointer exists
if(GL.glUseProgram && prog != 0)
if(GL.glUseProgram && prog != 0xDEADBEEF)
GL.glUseProgram(prog);
if(GL.glBindProgramPipeline && pipe != 0)
if(GL.glBindProgramPipeline && pipe != 0xDEADBEEF)
GL.glBindProgramPipeline(pipe);
}
}