From e082ebad1a08bf861957c38692bd152c3dce0975 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 29 Dec 2015 07:32:39 -0500 Subject: HiresTextures: Remove the need to explicitly free SOIL allocated data --- Source/Core/VideoCommon/TextureCacheBase.cpp | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'Source/Core/VideoCommon/TextureCacheBase.cpp') diff --git a/Source/Core/VideoCommon/TextureCacheBase.cpp b/Source/Core/VideoCommon/TextureCacheBase.cpp index 341977d7a8..b4e15ebdae 100644 --- a/Source/Core/VideoCommon/TextureCacheBase.cpp +++ b/Source/Core/VideoCommon/TextureCacheBase.cpp @@ -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 -- cgit v1.2.3