summaryrefslogtreecommitdiff
path: root/Source/Core/VideoCommon/TextureCacheBase.cpp
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2015-12-29 07:32:39 -0500
committerLioncash <mathew1800@gmail.com>2015-12-29 08:40:17 -0500
commite082ebad1a08bf861957c38692bd152c3dce0975 (patch)
tree22822ea1f57750b0d3fc61836607337ef0ca5450 /Source/Core/VideoCommon/TextureCacheBase.cpp
parent1d01fbd2175968dea6e7e0fcf4ba6bfb83bf32b8 (diff)
HiresTextures: Remove the need to explicitly free SOIL allocated data
Diffstat (limited to 'Source/Core/VideoCommon/TextureCacheBase.cpp')
-rw-r--r--Source/Core/VideoCommon/TextureCacheBase.cpp26
1 files changed, 13 insertions, 13 deletions
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