From ddea71cd94b671f5445840ca9c722ca00a968666 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Mon, 30 Mar 2020 11:39:30 +0100
Subject: [PATCH] Hide any debug messages found while fetching render state.
 Closes #1802

---
 renderdoc/driver/gl/gl_driver.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/renderdoc/driver/gl/gl_driver.cpp b/renderdoc/driver/gl/gl_driver.cpp
index 51186053f..e83f5fbc1 100644
--- a/renderdoc/driver/gl/gl_driver.cpp
+++ b/renderdoc/driver/gl/gl_driver.cpp
@@ -2937,8 +2937,16 @@ bool WrappedOpenGL::Serialise_BeginCaptureFrame(SerialiserType &ser)
 
   if(ser.IsWriting())
   {
+    rdcarray<DebugMessage> savedDebugMessages;
+
+    // save any debug messages we built up
+    savedDebugMessages.swap(m_DebugMessages);
+
     state.FetchState(this);
     state.MarkReferenced(this, true);
+
+    // restore saved messages - which implicitly discards any generated while fetching state
+    savedDebugMessages.swap(m_DebugMessages);
   }
 
   SERIALISE_ELEMENT(state);