summaryrefslogtreecommitdiff
path: root/Source/Core/VideoBackends/D3D/Src/TextureCache.cpp
diff options
context:
space:
mode:
authorMatthew Parlane <parlane@gmail.com>2013-11-17 11:12:07 +1300
committerMatthew Parlane <parlane@gmail.com>2013-11-17 11:14:38 +1300
commit33d8166620d308f5d7644e64ca92e588ff75fa44 (patch)
treed7fa08d4b12bd3119af0e76632cd29fb86aa4693 /Source/Core/VideoBackends/D3D/Src/TextureCache.cpp
parentcce869ae0169970ef20663d04701c58527755ddf (diff)
Use IOFile for TextureToPng to support non-ascii
Changed save texture/screenshot uses to std::string Removed unneeded new/delete calls when dealing with temp data.
Diffstat (limited to 'Source/Core/VideoBackends/D3D/Src/TextureCache.cpp')
-rw-r--r--Source/Core/VideoBackends/D3D/Src/TextureCache.cpp11
1 files changed, 2 insertions, 9 deletions
diff --git a/Source/Core/VideoBackends/D3D/Src/TextureCache.cpp b/Source/Core/VideoBackends/D3D/Src/TextureCache.cpp
index cfc25bd38f..22e644b2d8 100644
--- a/Source/Core/VideoBackends/D3D/Src/TextureCache.cpp
+++ b/Source/Core/VideoBackends/D3D/Src/TextureCache.cpp
@@ -33,7 +33,7 @@ void TextureCache::TCacheEntry::Bind(unsigned int stage)
D3D::context->PSSetShaderResources(stage, 1, &texture->GetSRV());
}
-bool TextureCache::TCacheEntry::Save(const char filename[], unsigned int level)
+bool TextureCache::TCacheEntry::Save(const std::string filename, unsigned int level)
{
// TODO: Somehow implement this (D3DX11 doesn't support dumping individual LODs)
static bool warn_once = true;
@@ -65,14 +65,7 @@ bool TextureCache::TCacheEntry::Save(const char filename[], unsigned int level)
HRESULT hr = D3D::context->Map(pNewTexture, 0, D3D11_MAP_READ_WRITE, 0, &map);
if (SUCCEEDED(hr))
{
- if (map.pData)
- {
- u8* data = new u8[map.RowPitch * desc.Height];
- memcpy(data, map.pData, map.RowPitch * desc.Height);
-
- saved_png = TextureToPng(data, map.RowPitch, filename, desc.Width, desc.Height);
- delete[] data;
- }
+ saved_png = TextureToPng((u8*)map.pData, map.RowPitch, filename, desc.Width, desc.Height);
D3D::context->Unmap(pNewTexture, 0);
}
SAFE_RELEASE(pNewTexture);