piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 06:39:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Add an OSD message when taking screenshots in D3D9/D3D11

Browse Source 
Fixes issue 6486.
This commit is contained in:
Pierre Bourdon
2013-08-24 01:41:17 +02:00
parent 6df36ec687
commit 367d6dfd65
4 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Core/VideoCommon/Src/OnScreenDisplay.cpp
View File

@ -58,6 +58,11 @@ void AddMessage(const char* pstr, u32 ms)
s_listMsgs.push_back(MESSAGE(pstr, Common::Timer::GetTimeMs() + 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() void DrawMessages()
{ {
if(!SConfig::GetInstance().m_LocalCoreStartupParameter.bOnScreenDisplayMessages) if(!SConfig::GetInstance().m_LocalCoreStartupParameter.bOnScreenDisplayMessages)

5
Source/Core/VideoCommon/Src/OnScreenDisplay.h
View File

@ -5,11 +5,14 @@
#ifndef _OSD_H_ #ifndef _OSD_H_
#define _OSD_H_ #define _OSD_H_
namespace OSD #include <string>
namespace OSD
{ {
// On-screen message display // On-screen message display
void AddMessage(const char* str, u32 ms = 2000); 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 DrawMessages(); // draw the current messages on the screen. Only call once per frame.
void ClearMessages(); void ClearMessages();

9
Source/Plugins/Plugin_VideoDX11/Src/Render.cpp
View File

@ -745,6 +745,15 @@ bool Renderer::SaveScreenshot(const std::string &filename, const TargetRectangle
// ready to be saved // ready to be saved
HRESULT hr = PD3DX11SaveTextureToFileA(D3D::context, s_screenshot_texture, D3DX11_IFF_PNG, filename.c_str()); 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); return SUCCEEDED(hr);
} }

1
Source/Plugins/Plugin_VideoDX9/Src/Render.cpp
View File

@ -742,6 +742,7 @@ bool Renderer::SaveScreenshot(const std::string &filename, const TargetRectangle
PanicAlert("Error saving screen."); PanicAlert("Error saving screen.");
return false; return false;
} }
OSD::AddMessage(StringFromFormat("Saved %i x %i %s", dst_rect.GetWidth(), dst_rect.GetHeight(), filename.c_str()));
return true; return true;
} }