From 9524438129bfb5a3af13f139c47a9db0649bd7c0 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Tue, 2 Jun 2020 10:39:44 +0100
Subject: [PATCH] End active unbalanced queries/transform feedback after active
 replay

* Some drivers have issues doing normal work while queries or XFB are active,
  and there's no reason to keep them active indefinitely since they might not be
  closed by a subsequent draw replay (if multiple draws are spanned and we
  select a draw in the middle).
---
 renderdoc/driver/gl/gl_driver.cpp | 35 +++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/renderdoc/driver/gl/gl_driver.cpp b/renderdoc/driver/gl/gl_driver.cpp
index 74dc92840..95765df54 100644
--- a/renderdoc/driver/gl/gl_driver.cpp
+++ b/renderdoc/driver/gl/gl_driver.cpp
@@ -5144,6 +5144,41 @@ ReplayStatus WrappedOpenGL::ContextReplayLog(CaptureState readType, uint32_t sta
     }
   }
 
+  if(IsActiveReplaying(m_State))
+  {
+    for(size_t i = 0; i < 8; i++)
+    {
+      GLenum q = QueryEnum(i);
+      if(q == eGL_NONE)
+        break;
+
+      int indices = IsGLES ? 1 : 8;    // GLES does not support indices
+      for(int j = 0; j < indices; j++)
+      {
+        if(m_ActiveQueries[i][j])
+        {
+          if(IsGLES)
+            GL.glEndQuery(q);
+          else
+            GL.glEndQueryIndexed(q, j);
+          m_ActiveQueries[i][j] = false;
+        }
+      }
+    }
+
+    if(m_ActiveConditional)
+    {
+      GL.glEndConditionalRender();
+      m_ActiveConditional = false;
+    }
+
+    if(m_ActiveFeedback)
+    {
+      GL.glEndTransformFeedback();
+      m_ActiveFeedback = false;
+    }
+  }
+
   return ReplayStatus::Succeeded;
 }