Framedumps: Add finish() function to limit memory lifetime.

dolphin-emu · Oct 7, 2016 · 1d5fbe0 · 1d5fbe0
1 parent 3255078
commit 1d5fbe0
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 0 deletions.
diff --git a/Source/Core/VideoBackends/D3D/Render.cpp b/Source/Core/VideoBackends/D3D/Render.cpp
@@ -891,6 +891,7 @@ void Renderer::SwapImpl(u32 xfbAddr, u32 fbWidth, u32 fbStride, u32 fbHeight,
     formatBufferDump((u8*)map.pData, image.data(), source_width, source_height, map.RowPitch);
 
     DumpFrameData(image.data(), source_width, source_height, AVIDump::DumpFormat::FORMAT_BGR, true);
+    FinishFrameData();
 
     D3D::context->Unmap(s_screenshot_texture, 0);
   }

diff --git a/Source/Core/VideoBackends/D3D12/Render.cpp b/Source/Core/VideoBackends/D3D12/Render.cpp
@@ -869,6 +869,7 @@ void Renderer::SwapImpl(u32 xfb_addr, u32 fb_width, u32 fb_stride, u32 fb_height
                      source_height, dst_location.PlacedFootprint.Footprint.RowPitch);
 
     DumpFrameData(image.data(), source_width, source_height, AVIDump::DumpFormat::FORMAT_BGR, true);
+    FinishFrameData();
 
     D3D12_RANGE write_range = {};
     s_screenshot_texture->Unmap(0, &write_range);

diff --git a/Source/Core/VideoBackends/OGL/Render.cpp b/Source/Core/VideoBackends/OGL/Render.cpp
@@ -1470,6 +1470,7 @@ void Renderer::SwapImpl(u32 xfbAddr, u32 fbWidth, u32 fbStride, u32 fbHeight,
 
     DumpFrameData(image.data(), flipped_trc.GetWidth(), flipped_trc.GetHeight(),
                   AVIDump::DumpFormat::FORMAT_RGBA, true);
+    FinishFrameData();
   }
   // Finish up the current frame, print some stats
 

diff --git a/Source/Core/VideoBackends/Vulkan/Renderer.cpp b/Source/Core/VideoBackends/Vulkan/Renderer.cpp
@@ -497,6 +497,7 @@ void Renderer::SwapImpl(u32 xfb_addr, u32 fb_width, u32 fb_stride, u32 fb_height
                     static_cast<int>(m_screenshot_render_texture->GetWidth()),
                     static_cast<int>(m_screenshot_render_texture->GetHeight()),
                     AVIDump::DumpFormat::FORMAT_RGBA);
+      FinishFrameData();
     }
   }
 

diff --git a/Source/Core/VideoCommon/RenderBase.cpp b/Source/Core/VideoCommon/RenderBase.cpp
@@ -605,6 +605,10 @@ void Renderer::DumpFrameData(const u8* data, int w, int h, AVIDump::DumpFormat f
 #endif
 }
 
+void Renderer::FinishFrameData()
+{
+}
+
 void Renderer::FlipImageData(u8* data, int w, int h, int pixel_width)
 {
   for (int y = 0; y < h / 2; ++y)

diff --git a/Source/Core/VideoCommon/RenderBase.h b/Source/Core/VideoCommon/RenderBase.h
@@ -150,6 +150,7 @@ class Renderer
   bool IsFrameDumping();
   void DumpFrameData(const u8* data, int w, int h, AVIDump::DumpFormat format,
                      bool swap_upside_down = false);
+  void FinishFrameData();
 
   static volatile bool s_bScreenshot;
   static std::mutex s_criticalScreenshot;