piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-14 21:37:52 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1383 from lioncash/delete

Browse Source 
TextureCache: Get rid of explicit deletes in SaveTexture
This commit is contained in:
Lioncash 2014-10-24 12:10:54 -04:00
commit 91c4b0c40b
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Core/VideoBackends/OGL/TextureCache.cpp
View File

@ -53,10 +53,10 @@ bool SaveTexture(const std::string& filename, u32 textarget, u32 tex, int virtua
return false;
int width = std::max(virtual_width >> level, 1);
int height = std::max(virtual_height >> level, 1);
u8* data = new u8[width * height * 4];
std::vector<u8> data(width * height * 4);
glActiveTexture(GL_TEXTURE0+9);
glBindTexture(textarget, tex);
glGetTexImage(textarget, level, GL_RGBA, GL_UNSIGNED_BYTE, data);
glGetTexImage(textarget, level, GL_RGBA, GL_UNSIGNED_BYTE, data.data());
glBindTexture(textarget, 0);
TextureCache::SetStage();
@ -64,12 +64,10 @@ bool SaveTexture(const std::string& filename, u32 textarget, u32 tex, int virtua
if (GL_NO_ERROR != err)
{
PanicAlert("Can't save texture, GL Error: %d", err);
delete[] data;
return false;
}
bool success = TextureToPng(data, width * 4, filename, width, height, true);
delete[] data;
return success;
return TextureToPng(data.data(), width * 4, filename, width, height, true);
}
TextureCache::TCacheEntry::~TCacheEntry()