From a57cc118afc5a66461f71d5fb77bf51ec1c48b2e Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Wed, 21 Feb 2018 18:29:51 +0000
Subject: [PATCH] Add events for markers in GL/D3D11 so they don't mess up
 replay

* If a marker was the very first event, we want to be able to fetch it
  so the replay isn't off-by-one after that.
---
 renderdoc/driver/d3d11/d3d11_context.cpp | 8 +++-----
 renderdoc/driver/gl/gl_driver.cpp        | 9 ++++-----
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/renderdoc/driver/d3d11/d3d11_context.cpp b/renderdoc/driver/d3d11/d3d11_context.cpp
index 630af3873..ce1d38547 100644
--- a/renderdoc/driver/d3d11/d3d11_context.cpp
+++ b/renderdoc/driver/d3d11/d3d11_context.cpp
@@ -889,11 +889,9 @@ bool WrappedID3D11DeviceContext::ProcessChunk(ReadSerialiser &ser, D3D11Chunk ch
       if(m_DrawcallStack.size() > 1)
         m_DrawcallStack.pop_back();
     }
-    else
-    {
-      if(!m_AddedDrawcall)
-        AddEvent();
-    }
+
+    if(!m_AddedDrawcall)
+      AddEvent();
   }
 
   m_AddedDrawcall = false;
diff --git a/renderdoc/driver/gl/gl_driver.cpp b/renderdoc/driver/gl/gl_driver.cpp
index adcb51b17..dc0aa58e7 100644
--- a/renderdoc/driver/gl/gl_driver.cpp
+++ b/renderdoc/driver/gl/gl_driver.cpp
@@ -4105,12 +4105,11 @@ bool WrappedOpenGL::ContextProcessChunk(ReadSerialiser &ser, GLChunk chunk)
           m_DrawcallStack.pop_back();
         break;
       }
-      default:
-      {
-        if(!m_AddedDrawcall)
-          AddEvent();
-      }
+      default: break;
     }
+
+    if(!m_AddedDrawcall)
+      AddEvent();
   }
 
   m_AddedDrawcall = false;