Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Add an OSD message when taking screenshots in D3D9/D3D11
Fixes issue 6486.
  • Loading branch information
delroth committed Aug 23, 2013
1 parent 6df36ec commit 367d6df
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 1 deletion.
5 changes: 5 additions & 0 deletions Source/Core/VideoCommon/Src/OnScreenDisplay.cpp
Expand Up @@ -58,6 +58,11 @@ void AddMessage(const char* pstr, u32 ms)
s_listMsgs.push_back(MESSAGE(pstr, Common::Timer::GetTimeMs() + ms));
}

void AddMessage(const std::string& str, u32 ms)
{
AddMessage(str.c_str(), ms);
}

void DrawMessages()
{
if(!SConfig::GetInstance().m_LocalCoreStartupParameter.bOnScreenDisplayMessages)
Expand Down
5 changes: 4 additions & 1 deletion Source/Core/VideoCommon/Src/OnScreenDisplay.h
Expand Up @@ -5,11 +5,14 @@
#ifndef _OSD_H_
#define _OSD_H_

namespace OSD
#include <string>

namespace OSD
{

// On-screen message display
void AddMessage(const char* str, u32 ms = 2000);
void AddMessage(const std::string& str, u32 ms = 2000);
void DrawMessages(); // draw the current messages on the screen. Only call once per frame.
void ClearMessages();

Expand Down
9 changes: 9 additions & 0 deletions Source/Plugins/Plugin_VideoDX11/Src/Render.cpp
Expand Up @@ -745,6 +745,15 @@ bool Renderer::SaveScreenshot(const std::string &filename, const TargetRectangle

// ready to be saved
HRESULT hr = PD3DX11SaveTextureToFileA(D3D::context, s_screenshot_texture, D3DX11_IFF_PNG, filename.c_str());
if (SUCCEEDED(hr))
{
OSD::AddMessage(StringFromFormat("Saved %i x %i %s", D3D::GetBackBufferWidth(),
D3D::GetBackBufferHeight(), filename.c_str()));
}
else
{
OSD::AddMessage(StringFromFormat("Error saving %s", filename.c_str()));
}

return SUCCEEDED(hr);
}
Expand Down
1 change: 1 addition & 0 deletions Source/Plugins/Plugin_VideoDX9/Src/Render.cpp
Expand Up @@ -742,6 +742,7 @@ bool Renderer::SaveScreenshot(const std::string &filename, const TargetRectangle
PanicAlert("Error saving screen.");
return false;
}
OSD::AddMessage(StringFromFormat("Saved %i x %i %s", dst_rect.GetWidth(), dst_rect.GetHeight(), filename.c_str()));

return true;
}
Expand Down

0 comments on commit 367d6df

Please sign in to comment.