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

Merge remote-tracking branch 'shuffle2/vc12'

Browse Source 
Conflicts:
	Source/Core/Common/Common.vcxproj
	Source/Core/Common/Common.vcxproj.filters
This commit is contained in:
comex
2013-10-31 16:51:56 -04:00
parent 4c7bbd96e4 8dcd13cca7
commit 82729fcc8f
391 changed files with 104559 additions and 35674 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Core/VideoBackends/D3D/Src/Render.cpp
View File

@ -704,7 +704,8 @@ bool Renderer::SaveScreenshot(const std::string &filename, const TargetRectangle
D3D::context->Unmap(s_screenshot_texture, 0);
// 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());
HRESULT hr = 0;
if (SUCCEEDED(hr))
{
OSD::AddMessage(StringFromFormat("Saved %i x %i %s", rc.GetWidth(),