From 8e77703cd187a641c5101be76fcb6c53eb1f2f94 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Thu, 1 Oct 2020 11:55:48 +0100
Subject: [PATCH] When fetching API validation messages in GL, only fetch
 'live' messages

* Any messages we add ourselves will already have an event ID so we keep them
  separately.
---
 renderdoc/driver/gl/gl_driver.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/renderdoc/driver/gl/gl_driver.cpp b/renderdoc/driver/gl/gl_driver.cpp
index c9460eeb3..40eb1adbe 100644
--- a/renderdoc/driver/gl/gl_driver.cpp
+++ b/renderdoc/driver/gl/gl_driver.cpp
@@ -3071,7 +3071,8 @@ void WrappedOpenGL::Serialise_DebugMessages(SerialiserType &ser)
   if(ser.IsReading() && IsLoading(m_State) && m_ReplayOptions.apiValidation)
   {
     DebugMessages = m_DebugMessages;
-    m_DebugMessages.clear();
+    m_DebugMessages.removeIf([](const DebugMessage &msg) { return msg.eventId == 0; });
+    DebugMessages.removeIf([](const DebugMessage &msg) { return msg.eventId != 0; });
   }
 
   // hide empty sets of messages.