mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-04-28 07:18:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

HiresTextures: Remove the need to explicitly free SOIL allocated data

Browse source
This commit is contained in:
Lioncash 2015-12-29 07:32:39 -05:00
parent 1d01fbd217
commit e082ebad1a
3 changed files with 29 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Source/Core/VideoCommon/TextureCacheBase.cpp
View file

@ -605,16 +605,16 @@ TextureCacheBase::TCacheEntryBase* TextureCacheBase::Load(const u32 stage)
if (hires_tex)
{
auto& l = hires_tex->m_levels[0];
if (l.width != width || l.height != height)
const auto& level = hires_tex->m_levels[0];
if (level.width != width || level.height != height)
{
width = l.width;
height = l.height;
width = level.width;
height = level.height;
}
expandedWidth = l.width;
expandedHeight = l.height;
CheckTempSize(l.data_size);
memcpy(temp, l.data, l.data_size);
expandedWidth = level .width;
expandedHeight = level.height;
CheckTempSize(level.data_size);
memcpy(temp, level.data.get(), level.data_size);
}
}
@ -678,12 +678,12 @@ TextureCacheBase::TCacheEntryBase* TextureCacheBase::Load(const u32 stage)
if (hires_tex)
{
for (u32 level = 1; level != texLevels; ++level)
for (u32 level_index = 1; level_index != texLevels; ++level_index)
{
auto& l = hires_tex->m_levels[level];
CheckTempSize(l.data_size);
memcpy(temp, l.data, l.data_size);
entry->Load(l.width, l.height, l.width, level);
const auto& level = hires_tex->m_levels[level_index];
CheckTempSize(level.data_size);
memcpy(temp, level.data.get(), level.data_size);
entry->Load(level.width, level.height, level.width, level_index);
}
}
else