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

HiresTextures: Remove the need to explicitly free SOIL allocated data

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Source/Core/VideoCommon/HiresTextures.cpp
View File

@ -41,6 +41,11 @@ static std::thread s_prefetcher;
static const std::string s_format_prefix = "tex1_";
HiresTexture::Level::Level()
: data(nullptr, SOIL_free_image_data)
{
}
void HiresTexture::Init()
{
s_check_native_format = false;
@ -387,7 +392,7 @@ std::unique_ptr<HiresTexture> HiresTexture::Load(const std::string& base_filenam
file.ReadBytes(buffer.data(), file.GetSize());
int channels;
l.data = SOIL_load_image_from_memory(buffer.data(), (int)buffer.size(), (int*)&l.width, (int*)&l.height, &channels, SOIL_LOAD_RGBA);
l.data = SOILPointer(SOIL_load_image_from_memory(buffer.data(), (int)buffer.size(), (int*)&l.width, (int*)&l.height, &channels, SOIL_LOAD_RGBA), SOIL_free_image_data);
l.data_size = (size_t)l.width * l.height * 4;
if (l.data == nullptr)
@ -411,7 +416,7 @@ std::unique_ptr<HiresTexture> HiresTexture::Load(const std::string& base_filenam
{
ERROR_LOG(VIDEO, "Invalid custom texture size %dx%d for texture %s. This mipmap layer _must_ be %dx%d.",
l.width, l.height, filename.c_str(), width, height);
SOIL_free_image_data(l.data);
l.data.reset();
break;
}
@ -421,7 +426,7 @@ std::unique_ptr<HiresTexture> HiresTexture::Load(const std::string& base_filenam
if (!ret)
ret = std::unique_ptr<HiresTexture>(new HiresTexture);
ret->m_levels.push_back(l);
ret->m_levels.push_back(std::move(l));
}
else
{
@ -434,9 +439,4 @@ std::unique_ptr<HiresTexture> HiresTexture::Load(const std::string& base_filenam
HiresTexture::~HiresTexture()
{
for (auto& l : m_levels)
{
SOIL_free_image_data(l.data);
}
}

11
Source/Core/VideoCommon/HiresTextures.h
View File

@ -13,6 +13,8 @@
class HiresTexture
{
public:
using SOILPointer = std::unique_ptr<u8, void(*)(unsigned char*)>;
static void Init();
static void Update();
static void Shutdown();
@ -36,9 +38,12 @@ public:
struct Level
{
u8* data;
size_t data_size;
u32 width, height;
Level();
SOILPointer data;
size_t data_size = 0;
u32 width = 0;
u32 height = 0;
};
std::vector<Level> m_levels;

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