From b7c755192cbba01df9aa5023c2c5a3550de8d0ee Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Fri, 31 Mar 2017 14:39:30 +0100
Subject: [PATCH] Remove no-longer used 'context' member of APIEvent structure

---
 renderdoc/api/replay/data_types.h         | 2 --
 renderdoc/core/replay_proxy.cpp           | 3 +--
 renderdoc/driver/d3d12/d3d12_commands.cpp | 1 -
 renderdoc/driver/gl/gl_driver.cpp         | 1 -
 renderdoc/driver/vulkan/vk_core.cpp       | 1 -
 renderdocui/Interop/FetchInfo.cs          | 2 --
 6 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/renderdoc/api/replay/data_types.h b/renderdoc/api/replay/data_types.h
index 4cf5cc894..5ec468212 100644
--- a/renderdoc/api/replay/data_types.h
+++ b/renderdoc/api/replay/data_types.h
@@ -111,8 +111,6 @@ struct FetchAPIEvent
 {
   uint32_t eventID;
 
-  ResourceId context;
-
   rdctype::array<uint64_t> callstack;
 
   rdctype::str eventDesc;
diff --git a/renderdoc/core/replay_proxy.cpp b/renderdoc/core/replay_proxy.cpp
index 8095dccea..704de9d15 100644
--- a/renderdoc/core/replay_proxy.cpp
+++ b/renderdoc/core/replay_proxy.cpp
@@ -1319,12 +1319,11 @@ template <>
 void Serialiser::Serialise(const char *name, FetchAPIEvent &el)
 {
   Serialise("", el.eventID);
-  Serialise("", el.context);
   Serialise("", el.callstack);
   Serialise("", el.eventDesc);
   Serialise("", el.fileOffset);
 
-  SIZE_CHECK(56);
+  SIZE_CHECK(48);
 }
 
 template <>
diff --git a/renderdoc/driver/d3d12/d3d12_commands.cpp b/renderdoc/driver/d3d12/d3d12_commands.cpp
index d6991d07b..2ded2c519 100644
--- a/renderdoc/driver/d3d12/d3d12_commands.cpp
+++ b/renderdoc/driver/d3d12/d3d12_commands.cpp
@@ -950,7 +950,6 @@ void D3D12CommandData::AddEvent(string description)
 {
   FetchAPIEvent apievent;
 
-  apievent.context = ResourceId();
   apievent.fileOffset = m_CurChunkOffset;
   apievent.eventID = m_LastCmdListID != ResourceId() ? m_BakedCmdListInfo[m_LastCmdListID].curEventID
                                                      : m_RootEventID;
diff --git a/renderdoc/driver/gl/gl_driver.cpp b/renderdoc/driver/gl/gl_driver.cpp
index d07371348..6d7379841 100644
--- a/renderdoc/driver/gl/gl_driver.cpp
+++ b/renderdoc/driver/gl/gl_driver.cpp
@@ -4216,7 +4216,6 @@ void WrappedOpenGL::AddEvent(string description)
 {
   FetchAPIEvent apievent;
 
-  apievent.context = GetResourceManager()->GetOriginalID(m_ContextResourceID);
   apievent.fileOffset = m_CurChunkOffset;
   apievent.eventID = m_CurEventID;
 
diff --git a/renderdoc/driver/vulkan/vk_core.cpp b/renderdoc/driver/vulkan/vk_core.cpp
index 0afae5664..967643ddc 100644
--- a/renderdoc/driver/vulkan/vk_core.cpp
+++ b/renderdoc/driver/vulkan/vk_core.cpp
@@ -3040,7 +3040,6 @@ void WrappedVulkan::AddEvent(string description)
 {
   FetchAPIEvent apievent;
 
-  apievent.context = ResourceId();
   apievent.fileOffset = m_CurChunkOffset;
   apievent.eventID = m_LastCmdBufferID != ResourceId()
                          ? m_BakedCmdBufferInfo[m_LastCmdBufferID].curEventID
diff --git a/renderdocui/Interop/FetchInfo.cs b/renderdocui/Interop/FetchInfo.cs
index 1a3323963..0b41067eb 100644
--- a/renderdocui/Interop/FetchInfo.cs
+++ b/renderdocui/Interop/FetchInfo.cs
@@ -505,8 +505,6 @@ namespace renderdoc
     {
         public UInt32 eventID;
 
-        public ResourceId context;
-
         [CustomMarshalAs(CustomUnmanagedType.TemplatedArray)]
         public UInt64[] callstack;