summaryrefslogtreecommitdiff
path: root/Source/Core/VideoBackends/D3D/Render.cpp
diff options
context:
space:
mode:
authordegasus <wickmarkus@web.de>2016-10-08 18:23:57 +0200
committerdegasus <wickmarkus@web.de>2016-10-08 19:38:57 +0200
commit64927a2f81fe64503060c949ead525995fd63a2a (patch)
treec40d8f488df2c695a1e97cbe49198ffaf99fcfe1 /Source/Core/VideoBackends/D3D/Render.cpp
parent21e42c68c4ec1e9e9925f3cfeefed12054cc6b71 (diff)
Renderer: Merge screenshot logic into VideoCommon.
Diffstat (limited to 'Source/Core/VideoBackends/D3D/Render.cpp')
-rw-r--r--Source/Core/VideoBackends/D3D/Render.cpp45
1 files changed, 0 insertions, 45 deletions
diff --git a/Source/Core/VideoBackends/D3D/Render.cpp b/Source/Core/VideoBackends/D3D/Render.cpp
index d3a44e4dfa..ef923af20d 100644
--- a/Source/Core/VideoBackends/D3D/Render.cpp
+++ b/Source/Core/VideoBackends/D3D/Render.cpp
@@ -32,7 +32,6 @@
#include "VideoCommon/AVIDump.h"
#include "VideoCommon/BPFunctions.h"
#include "VideoCommon/Fifo.h"
-#include "VideoCommon/ImageWrite.h"
#include "VideoCommon/OnScreenDisplay.h"
#include "VideoCommon/PixelEngine.h"
#include "VideoCommon/PixelShaderManager.h"
@@ -712,39 +711,6 @@ void Renderer::SetBlendMode(bool forceUpdate)
}
}
-bool Renderer::SaveScreenshot(const std::string& filename, const TargetRectangle& rc)
-{
- if (!s_screenshot_texture)
- CreateScreenshotTexture();
-
- // copy back buffer to system memory
- D3D11_BOX source_box = GetScreenshotSourceBox(rc);
- D3D::context->CopySubresourceRegion(s_screenshot_texture, 0, 0, 0, 0,
- (ID3D11Resource*)D3D::GetBackBuffer()->GetTex(), 0,
- &source_box);
-
- D3D11_MAPPED_SUBRESOURCE map;
- D3D::context->Map(s_screenshot_texture, 0, D3D11_MAP_READ_WRITE, 0, &map);
-
- bool saved_png =
- TextureToPng((u8*)map.pData, map.RowPitch, filename, source_box.right - source_box.left,
- source_box.bottom - source_box.top, false);
-
- D3D::context->Unmap(s_screenshot_texture, 0);
-
- if (saved_png)
- {
- OSD::AddMessage(
- StringFromFormat("Saved %i x %i %s", rc.GetWidth(), rc.GetHeight(), filename.c_str()));
- }
- else
- {
- OSD::AddMessage(StringFromFormat("Error saving %s", filename.c_str()));
- }
-
- return saved_png;
-}
-
// This function has the final picture. We adjust the aspect ratio here.
void Renderer::SwapImpl(u32 xfbAddr, u32 fbWidth, u32 fbStride, u32 fbHeight,
const EFBRectangle& rc, float Gamma)
@@ -843,17 +809,6 @@ void Renderer::SwapImpl(u32 xfbAddr, u32 fbWidth, u32 fbStride, u32 fbHeight,
BlitScreen(sourceRc, targetRc, read_texture, GetTargetWidth(), GetTargetHeight(), Gamma);
}
- // done with drawing the game stuff, good moment to save a screenshot
- if (s_bScreenshot)
- {
- std::lock_guard<std::mutex> guard(s_criticalScreenshot);
-
- SaveScreenshot(s_sScreenshotName, GetTargetRectangle());
- s_sScreenshotName.clear();
- s_bScreenshot = false;
- s_screenshotCompleted.Set();
- }
-
// Dump frames
if (IsFrameDumping())
{