ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

TextureCache: Get rid of explicit deletes in SaveTexture

This commit is contained in:
Lioncash 2014-10-24 08:25:53 -04:00
parent 3ab921d5b0
commit b1bdce7d77
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; return false;
int width = std::max(virtual_width >> level, 1); int width = std::max(virtual_width >> level, 1);
int height = std::max(virtual_height >> 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); glActiveTexture(GL_TEXTURE0+9);
glBindTexture(textarget, tex); 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); glBindTexture(textarget, 0);
TextureCache::SetStage(); TextureCache::SetStage();
@ -64,12 +64,10 @@ bool SaveTexture(const std::string& filename, u32 textarget, u32 tex, int virtua
if (GL_NO_ERROR != err) if (GL_NO_ERROR != err)
{ {
PanicAlert("Can't save texture, GL Error: %d", err); PanicAlert("Can't save texture, GL Error: %d", err);
delete[] data;
return false; return false;
} }
bool success = TextureToPng(data, width * 4, filename, width, height, true);
delete[] data; return TextureToPng(data.data(), width * 4, filename, width, height, true);
return success;
} }
TextureCache::TCacheEntry::~TCacheEntry() TextureCache::TCacheEntry::~TCacheEntry()