From 4f21c29258b26db7c7a68b175fec819338e0b662 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Fri, 31 Mar 2017 15:16:45 +0100
Subject: [PATCH] Remove unused firstEvent value, since the first event is
 always 1

---
 renderdoc/api/replay/data_types.h       | 2 --
 renderdoc/core/image_viewer.cpp         | 1 -
 renderdoc/core/replay_proxy.cpp         | 1 -
 renderdoc/driver/d3d11/d3d11_device.cpp | 3 +--
 renderdoc/driver/d3d12/d3d12_device.cpp | 3 +--
 renderdoc/driver/gl/gl_driver.cpp       | 3 +--
 renderdoc/driver/vulkan/vk_core.cpp     | 3 +--
 renderdocui/Interop/FetchInfo.cs        | 1 -
 8 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/renderdoc/api/replay/data_types.h b/renderdoc/api/replay/data_types.h
index c18f00f82..4cf5cc894 100644
--- a/renderdoc/api/replay/data_types.h
+++ b/renderdoc/api/replay/data_types.h
@@ -290,7 +290,6 @@ struct FetchFrameInfo
 {
   FetchFrameInfo()
       : frameNumber(0),
-        firstEvent(0),
         fileOffset(0),
         uncompressedFileSize(0),
         compressedFileSize(0),
@@ -301,7 +300,6 @@ struct FetchFrameInfo
   }
 
   uint32_t frameNumber;
-  uint32_t firstEvent;
   uint64_t fileOffset;
   uint64_t uncompressedFileSize;
   uint64_t compressedFileSize;
diff --git a/renderdoc/core/image_viewer.cpp b/renderdoc/core/image_viewer.cpp
index 185e3d9ac..97bc41736 100644
--- a/renderdoc/core/image_viewer.cpp
+++ b/renderdoc/core/image_viewer.cpp
@@ -44,7 +44,6 @@ public:
     m_Props.degraded = false;
 
     m_FrameRecord.frameInfo.fileOffset = 0;
-    m_FrameRecord.frameInfo.firstEvent = 1;
     m_FrameRecord.frameInfo.frameNumber = 1;
     RDCEraseEl(m_FrameRecord.frameInfo.stats);
 
diff --git a/renderdoc/core/replay_proxy.cpp b/renderdoc/core/replay_proxy.cpp
index a8e52ed56..8095dccea 100644
--- a/renderdoc/core/replay_proxy.cpp
+++ b/renderdoc/core/replay_proxy.cpp
@@ -1557,7 +1557,6 @@ template <>
 void Serialiser::Serialise(const char *name, FetchFrameInfo &el)
 {
   Serialise("", el.frameNumber);
-  Serialise("", el.firstEvent);
   Serialise("", el.fileOffset);
   Serialise("", el.uncompressedFileSize);
   Serialise("", el.compressedFileSize);
diff --git a/renderdoc/driver/d3d11/d3d11_device.cpp b/renderdoc/driver/d3d11/d3d11_device.cpp
index 15556809e..576644aaa 100644
--- a/renderdoc/driver/d3d11/d3d11_device.cpp
+++ b/renderdoc/driver/d3d11/d3d11_device.cpp
@@ -1100,7 +1100,6 @@ void WrappedID3D11Device::Serialise_CaptureScope(uint64_t offset)
   else
   {
     m_FrameRecord.frameInfo.fileOffset = offset;
-    m_FrameRecord.frameInfo.firstEvent = m_pImmediateContext->GetEventID();
     m_FrameRecord.frameInfo.frameNumber = FrameNumber;
 
     FetchFrameStatistics &stats = m_FrameRecord.frameInfo.stats;
@@ -2450,7 +2449,7 @@ void WrappedID3D11Device::ReplayLog(uint32_t startEventID, uint32_t endEventID,
 
   if(startEventID == 0 && (replayType == eReplay_WithoutDraw || replayType == eReplay_Full))
   {
-    startEventID = m_FrameRecord.frameInfo.firstEvent;
+    startEventID = 1;
     partial = false;
   }
 
diff --git a/renderdoc/driver/d3d12/d3d12_device.cpp b/renderdoc/driver/d3d12/d3d12_device.cpp
index b7209c183..b89cd9c68 100644
--- a/renderdoc/driver/d3d12/d3d12_device.cpp
+++ b/renderdoc/driver/d3d12/d3d12_device.cpp
@@ -1205,7 +1205,6 @@ void WrappedID3D12Device::Serialise_CaptureScope(uint64_t offset)
   else
   {
     m_FrameRecord.frameInfo.fileOffset = offset;
-    m_FrameRecord.frameInfo.firstEvent = 1;
     m_FrameRecord.frameInfo.frameNumber = FrameNumber;
     RDCEraseEl(m_FrameRecord.frameInfo.stats);
 
@@ -2422,7 +2421,7 @@ void WrappedID3D12Device::ReplayLog(uint32_t startEventID, uint32_t endEventID,
 
   if(startEventID == 0 && (replayType == eReplay_WithoutDraw || replayType == eReplay_Full))
   {
-    startEventID = m_FrameRecord.frameInfo.firstEvent;
+    startEventID = 1;
     partial = false;
 
     m_GPUSyncCounter++;
diff --git a/renderdoc/driver/gl/gl_driver.cpp b/renderdoc/driver/gl/gl_driver.cpp
index 78684a96a..d07371348 100644
--- a/renderdoc/driver/gl/gl_driver.cpp
+++ b/renderdoc/driver/gl/gl_driver.cpp
@@ -2863,7 +2863,6 @@ void WrappedOpenGL::Serialise_CaptureScope(uint64_t offset)
   else
   {
     m_FrameRecord.frameInfo.fileOffset = offset;
-    m_FrameRecord.frameInfo.firstEvent = 1;    // m_pImmediateContext->GetEventID();
     m_FrameRecord.frameInfo.frameNumber = FrameNumber;
     RDCEraseEl(m_FrameRecord.frameInfo.stats);
 
@@ -4265,7 +4264,7 @@ void WrappedOpenGL::ReplayLog(uint32_t startEventID, uint32_t endEventID, Replay
 
   if(startEventID == 0 && (replayType == eReplay_WithoutDraw || replayType == eReplay_Full))
   {
-    startEventID = m_FrameRecord.frameInfo.firstEvent;
+    startEventID = 1;
     partial = false;
   }
 
diff --git a/renderdoc/driver/vulkan/vk_core.cpp b/renderdoc/driver/vulkan/vk_core.cpp
index f67788954..0afae5664 100644
--- a/renderdoc/driver/vulkan/vk_core.cpp
+++ b/renderdoc/driver/vulkan/vk_core.cpp
@@ -993,7 +993,6 @@ void WrappedVulkan::Serialise_CaptureScope(uint64_t offset)
   else
   {
     m_FrameRecord.frameInfo.fileOffset = offset;
-    m_FrameRecord.frameInfo.firstEvent = 1;    // m_pImmediateContext->GetEventID();
     m_FrameRecord.frameInfo.frameNumber = FrameNumber;
     RDCEraseEl(m_FrameRecord.frameInfo.stats);
 
@@ -2336,7 +2335,7 @@ void WrappedVulkan::ReplayLog(uint32_t startEventID, uint32_t endEventID, Replay
 
   if(startEventID == 0 && (replayType == eReplay_WithoutDraw || replayType == eReplay_Full))
   {
-    startEventID = m_FrameRecord.frameInfo.firstEvent;
+    startEventID = 1;
     partial = false;
   }
 
diff --git a/renderdocui/Interop/FetchInfo.cs b/renderdocui/Interop/FetchInfo.cs
index 706781c9a..1a3323963 100644
--- a/renderdocui/Interop/FetchInfo.cs
+++ b/renderdocui/Interop/FetchInfo.cs
@@ -487,7 +487,6 @@ namespace renderdoc
     public class FetchFrameInfo
     {
         public UInt32 frameNumber;
-        public UInt32 firstEvent;
         public UInt64 fileOffset;
         public UInt64 uncompressedFileSize;
         public UInt64 compressedFileSize;