From 0659c7338f0be1bd17a9023d8ab16bf3765a1484 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Wed, 11 Dec 2019 16:45:21 +0000
Subject: [PATCH] Fix state push/pop not being quite right on GL

---
 renderdoc/driver/gl/gl_common.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/renderdoc/driver/gl/gl_common.cpp b/renderdoc/driver/gl/gl_common.cpp
index 6fc2367c0..3e1ccdf24 100644
--- a/renderdoc/driver/gl/gl_common.cpp
+++ b/renderdoc/driver/gl/gl_common.cpp
@@ -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);
   }
 }