From dae98c3547731f154812595ae7421cd0875e1e06 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Fri, 22 Jan 2021 14:57:35 +0000
Subject: [PATCH] Remove memset of struct that's no longer POD

---
 qrenderdoc/Code/CaptureContext.cpp      | 4 ++--
 renderdoc/driver/d3d12/d3d12_device.cpp | 1 -
 renderdoc/driver/gl/gl_driver.cpp       | 1 -
 renderdoc/driver/vulkan/vk_core.cpp     | 1 -
 4 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/qrenderdoc/Code/CaptureContext.cpp b/qrenderdoc/Code/CaptureContext.cpp
index 84fd19953..d10d979ab 100644
--- a/qrenderdoc/Code/CaptureContext.cpp
+++ b/qrenderdoc/Code/CaptureContext.cpp
@@ -1300,8 +1300,8 @@ void CaptureContext::CloseCapture()
 
   m_CaptureFile = QString();
 
-  memset(&m_APIProps, 0, sizeof(m_APIProps));
-  memset(&m_FrameInfo, 0, sizeof(m_FrameInfo));
+  m_APIProps = APIProperties();
+  m_FrameInfo = FrameDescription();
   m_Buffers.clear();
   m_BufferList.clear();
   m_Textures.clear();
diff --git a/renderdoc/driver/d3d12/d3d12_device.cpp b/renderdoc/driver/d3d12/d3d12_device.cpp
index 46a8ceecd..24927b461 100644
--- a/renderdoc/driver/d3d12/d3d12_device.cpp
+++ b/renderdoc/driver/d3d12/d3d12_device.cpp
@@ -2164,7 +2164,6 @@ void WrappedID3D12Device::StartFrameCapture(void *dev, void *wnd)
   FrameDescription frame;
   frame.frameNumber = ~0U;
   frame.captureTime = Timing::GetUnixTimestamp();
-  RDCEraseEl(frame.stats);
   m_CapturedFrames.push_back(frame);
 
   GetDebugMessages();
diff --git a/renderdoc/driver/gl/gl_driver.cpp b/renderdoc/driver/gl/gl_driver.cpp
index 0bcbaab8c..2422e9686 100644
--- a/renderdoc/driver/gl/gl_driver.cpp
+++ b/renderdoc/driver/gl/gl_driver.cpp
@@ -2194,7 +2194,6 @@ void WrappedOpenGL::StartFrameCapture(void *dev, void *wnd)
   FrameDescription frame;
   frame.frameNumber = m_AppControlledCapture ? ~0U : m_FrameCounter;
   frame.captureTime = Timing::GetUnixTimestamp();
-  RDCEraseEl(frame.stats);
   m_CapturedFrames.push_back(frame);
 
   GetResourceManager()->ClearReferencedResources();
diff --git a/renderdoc/driver/vulkan/vk_core.cpp b/renderdoc/driver/vulkan/vk_core.cpp
index 80143f814..371f5367c 100644
--- a/renderdoc/driver/vulkan/vk_core.cpp
+++ b/renderdoc/driver/vulkan/vk_core.cpp
@@ -1600,7 +1600,6 @@ void WrappedVulkan::StartFrameCapture(void *dev, void *wnd)
   FrameDescription frame;
   frame.frameNumber = ~0U;
   frame.captureTime = Timing::GetUnixTimestamp();
-  RDCEraseEl(frame.stats);
   m_CapturedFrames.push_back(frame);
 
   GetResourceManager()->ClearReferencedResources();