diff options
| author | Markus Wick <degasus@users.noreply.github.com> | 2016-10-08 18:13:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-08 18:13:05 +0200 |
| commit | 8b38d5a1155c9d91036935b2abc388aaa1822e41 (patch) | |
| tree | a2d7453ae1962185d119c7f0a818f41d0fbba00d /Source/Core/VideoBackends/OGL/Render.cpp | |
| parent | a9d8e3fe9b25ab97d9d95f4a28bde1e497aaf147 (diff) | |
| parent | 0864ef435219dbbded3b07a8159a85731e605087 (diff) | |
Merge pull request #4320 from degasus/framedump
Framedump: General code cleanup.
Diffstat (limited to 'Source/Core/VideoBackends/OGL/Render.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/OGL/Render.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Source/Core/VideoBackends/OGL/Render.cpp b/Source/Core/VideoBackends/OGL/Render.cpp index 2f53d0e9a6..4b8b638212 100644 --- a/Source/Core/VideoBackends/OGL/Render.cpp +++ b/Source/Core/VideoBackends/OGL/Render.cpp @@ -1353,7 +1353,6 @@ void Renderer::SwapImpl(u32 xfbAddr, u32 fbWidth, u32 fbStride, u32 fbHeight, if (Fifo::WillSkipCurrentFrame() || (!XFBWrited && !g_ActiveConfig.RealXFBEnabled()) || !fbWidth || !fbHeight) { - RepeatFrameDumpFrame(); Core::Callback_VideoCopiedToXFB(false); return; } @@ -1363,7 +1362,6 @@ void Renderer::SwapImpl(u32 xfbAddr, u32 fbWidth, u32 fbStride, u32 fbHeight, FramebufferManager::GetXFBSource(xfbAddr, fbStride, fbHeight, &xfbCount); if (g_ActiveConfig.VirtualXFBEnabled() && (!xfbSourceList || xfbCount == 0)) { - RepeatFrameDumpFrame(); Core::Callback_VideoCopiedToXFB(false); return; } @@ -1471,7 +1469,8 @@ void Renderer::SwapImpl(u32 xfbAddr, u32 fbWidth, u32 fbStride, u32 fbHeight, flipped_trc.GetHeight(), GL_RGBA, GL_UNSIGNED_BYTE, image.data()); DumpFrameData(image.data(), flipped_trc.GetWidth(), flipped_trc.GetHeight(), - AVIDump::DumpFormat::FORMAT_RGBA, true); + flipped_trc.GetWidth() * 4, AVIDump::DumpFormat::FORMAT_RGBA, true); + FinishFrameData(); } // Finish up the current frame, print some stats |