2015-05-24 04:55:12 +00:00
|
|
|
// Copyright 2009 Dolphin Emulator Project
|
2015-05-17 23:08:10 +00:00
|
|
|
// Licensed under GPLv2+
|
2013-04-18 03:09:55 +00:00
|
|
|
// Refer to the license.txt file included.
|
2009-07-06 02:10:26 +00:00
|
|
|
|
2014-02-17 10:18:15 +00:00
|
|
|
#include <algorithm>
|
2015-01-21 22:06:18 +00:00
|
|
|
#include <cinttypes>
|
2009-07-06 02:10:26 +00:00
|
|
|
#include <cstring>
|
2015-03-01 22:53:15 +00:00
|
|
|
#include <mutex>
|
2014-03-12 19:33:41 +00:00
|
|
|
#include <string>
|
2015-03-01 22:53:15 +00:00
|
|
|
#include <thread>
|
2009-07-06 02:10:26 +00:00
|
|
|
#include <utility>
|
2015-01-21 20:45:14 +00:00
|
|
|
#include <xxhash.h>
|
2010-03-09 22:17:33 +00:00
|
|
|
#include <SOIL/SOIL.h>
|
2014-02-17 10:18:15 +00:00
|
|
|
|
|
|
|
#include "Common/CommonPaths.h"
|
|
|
|
#include "Common/FileSearch.h"
|
|
|
|
#include "Common/FileUtil.h"
|
2015-03-01 22:53:15 +00:00
|
|
|
#include "Common/Flag.h"
|
2015-05-16 13:26:11 +00:00
|
|
|
#include "Common/MemoryUtil.h"
|
2014-02-17 10:18:15 +00:00
|
|
|
#include "Common/StringUtil.h"
|
2015-03-01 22:53:15 +00:00
|
|
|
#include "Common/Thread.h"
|
|
|
|
#include "Common/Timer.h"
|
2014-02-17 10:18:15 +00:00
|
|
|
|
2014-12-22 11:53:03 +00:00
|
|
|
#include "Core/ConfigManager.h"
|
2009-07-06 02:10:26 +00:00
|
|
|
|
2014-12-22 11:53:03 +00:00
|
|
|
#include "VideoCommon/HiresTextures.h"
|
2015-01-14 22:19:10 +00:00
|
|
|
#include "VideoCommon/OnScreenDisplay.h"
|
2014-12-22 11:53:03 +00:00
|
|
|
#include "VideoCommon/VideoConfig.h"
|
2009-07-06 02:10:26 +00:00
|
|
|
|
2015-01-14 20:53:05 +00:00
|
|
|
static std::unordered_map<std::string, std::string> s_textureMap;
|
2015-03-01 22:53:15 +00:00
|
|
|
static std::unordered_map<std::string, std::shared_ptr<HiresTexture>> s_textureCache;
|
|
|
|
static std::mutex s_textureCacheMutex;
|
|
|
|
static std::mutex s_textureCacheAquireMutex; // for high priority access
|
|
|
|
static Common::Flag s_textureCacheAbortLoading;
|
2015-01-14 20:53:05 +00:00
|
|
|
static bool s_check_native_format;
|
|
|
|
static bool s_check_new_format;
|
|
|
|
|
2015-03-01 22:53:15 +00:00
|
|
|
static std::thread s_prefetcher;
|
|
|
|
|
2015-01-14 20:53:05 +00:00
|
|
|
static const std::string s_format_prefix = "tex1_";
|
|
|
|
|
2015-03-01 22:53:15 +00:00
|
|
|
void HiresTexture::Init()
|
2009-07-06 02:10:26 +00:00
|
|
|
{
|
2015-01-14 20:53:05 +00:00
|
|
|
s_check_native_format = false;
|
|
|
|
s_check_new_format = false;
|
2011-02-05 10:08:06 +00:00
|
|
|
|
2015-03-01 22:53:15 +00:00
|
|
|
Update();
|
|
|
|
}
|
|
|
|
|
|
|
|
void HiresTexture::Shutdown()
|
|
|
|
{
|
|
|
|
if (s_prefetcher.joinable())
|
|
|
|
{
|
|
|
|
s_textureCacheAbortLoading.Set();
|
|
|
|
s_prefetcher.join();
|
|
|
|
}
|
|
|
|
|
|
|
|
s_textureMap.clear();
|
|
|
|
s_textureCache.clear();
|
|
|
|
}
|
|
|
|
|
|
|
|
void HiresTexture::Update()
|
|
|
|
{
|
|
|
|
if (s_prefetcher.joinable())
|
|
|
|
{
|
|
|
|
s_textureCacheAbortLoading.Set();
|
|
|
|
s_prefetcher.join();
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!g_ActiveConfig.bHiresTextures)
|
|
|
|
{
|
|
|
|
s_textureMap.clear();
|
|
|
|
s_textureCache.clear();
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!g_ActiveConfig.bCacheHiresTextures)
|
|
|
|
{
|
|
|
|
s_textureCache.clear();
|
|
|
|
}
|
|
|
|
|
2014-11-15 20:46:40 +00:00
|
|
|
std::vector<std::string> Directories;
|
2015-06-12 11:56:53 +00:00
|
|
|
const std::string& gameCode = SConfig::GetInstance().m_strUniqueID;
|
2013-10-29 05:23:17 +00:00
|
|
|
|
2014-03-12 19:33:41 +00:00
|
|
|
std::string szDir = StringFromFormat("%s%s", File::GetUserPath(D_HIRESTEXTURES_IDX).c_str(), gameCode.c_str());
|
2009-07-06 02:10:26 +00:00
|
|
|
|
2014-11-15 20:46:40 +00:00
|
|
|
std::vector<std::string> Extensions {
|
2014-03-12 19:33:41 +00:00
|
|
|
"*.png",
|
|
|
|
"*.bmp",
|
|
|
|
"*.tga",
|
|
|
|
"*.dds",
|
|
|
|
"*.jpg" // Why not? Could be useful for large photo-like textures
|
|
|
|
};
|
2009-07-06 02:10:26 +00:00
|
|
|
|
2014-11-15 20:46:40 +00:00
|
|
|
auto rFilenames = DoFileSearch(Extensions, {szDir}, /*recursive*/ true);
|
2014-03-12 19:33:41 +00:00
|
|
|
|
|
|
|
const std::string code = StringFromFormat("%s_", gameCode.c_str());
|
2015-01-14 20:53:05 +00:00
|
|
|
const std::string code2 = "";
|
2009-07-06 02:10:26 +00:00
|
|
|
|
2015-01-14 20:53:05 +00:00
|
|
|
for (auto& rFilename : rFilenames)
|
2009-07-06 02:10:26 +00:00
|
|
|
{
|
2015-01-14 20:53:05 +00:00
|
|
|
std::string FileName;
|
|
|
|
SplitPath(rFilename, nullptr, &FileName, nullptr);
|
|
|
|
|
2015-06-04 06:51:02 +00:00
|
|
|
if (FileName.substr(0, code.length()) == code)
|
|
|
|
{
|
|
|
|
s_textureMap[FileName] = rFilename;
|
|
|
|
s_check_native_format = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (FileName.substr(0, s_format_prefix.length()) == s_format_prefix)
|
2015-01-14 20:53:05 +00:00
|
|
|
{
|
|
|
|
s_textureMap[FileName] = rFilename;
|
|
|
|
s_check_new_format = true;
|
2009-07-06 02:10:26 +00:00
|
|
|
}
|
|
|
|
}
|
2015-03-01 22:53:15 +00:00
|
|
|
|
|
|
|
if (g_ActiveConfig.bCacheHiresTextures)
|
|
|
|
{
|
|
|
|
// remove cached but deleted textures
|
|
|
|
auto iter = s_textureCache.begin();
|
|
|
|
while (iter != s_textureCache.end())
|
|
|
|
{
|
|
|
|
if (s_textureMap.find(iter->first) == s_textureMap.end())
|
|
|
|
{
|
|
|
|
iter = s_textureCache.erase(iter);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
iter++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
s_textureCacheAbortLoading.Clear();
|
|
|
|
s_prefetcher = std::thread(Prefetch);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void HiresTexture::Prefetch()
|
|
|
|
{
|
|
|
|
Common::SetCurrentThreadName("Prefetcher");
|
|
|
|
|
|
|
|
size_t size_sum = 0;
|
2015-05-16 13:26:11 +00:00
|
|
|
size_t max_mem = MemPhysical() / 2;
|
2015-03-01 22:53:15 +00:00
|
|
|
u32 starttime = Common::Timer::GetTimeMs();
|
|
|
|
for (const auto& entry : s_textureMap)
|
|
|
|
{
|
|
|
|
const std::string& base_filename = entry.first;
|
|
|
|
|
|
|
|
if (base_filename.find("_mip") == std::string::npos)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
// try to get this mutex first, so the video thread is allow to get the real mutex faster
|
|
|
|
std::unique_lock<std::mutex> lk(s_textureCacheAquireMutex);
|
|
|
|
}
|
|
|
|
std::unique_lock<std::mutex> lk(s_textureCacheMutex);
|
|
|
|
|
|
|
|
auto iter = s_textureCache.find(base_filename);
|
|
|
|
if (iter == s_textureCache.end())
|
|
|
|
{
|
|
|
|
// unlock while loading a texture. This may result in a race condition where we'll load a texture twice,
|
|
|
|
// but it reduces the stuttering a lot. Notice: The loading library _must_ be thread safe now.
|
|
|
|
// But bad luck, SOIL isn't, so TODO: remove SOIL usage here and use libpng directly
|
|
|
|
// Also TODO: remove s_textureCacheAquireMutex afterwards. It won't be needed as the main mutex will be locked rarely
|
|
|
|
//lk.unlock();
|
2015-05-29 05:31:11 +00:00
|
|
|
HiresTexture* t = Load(base_filename, 0, 0);
|
2015-03-01 22:53:15 +00:00
|
|
|
//lk.lock();
|
2015-05-29 05:31:11 +00:00
|
|
|
if (t)
|
|
|
|
{
|
|
|
|
std::shared_ptr<HiresTexture> ptr(t);
|
|
|
|
iter = s_textureCache.insert(iter, std::make_pair(base_filename, ptr));
|
|
|
|
}
|
2015-03-01 22:53:15 +00:00
|
|
|
}
|
2015-05-29 05:31:11 +00:00
|
|
|
if (iter != s_textureCache.end())
|
2015-03-01 22:53:15 +00:00
|
|
|
{
|
2015-05-29 05:31:11 +00:00
|
|
|
for (const Level& l : iter->second->m_levels)
|
|
|
|
{
|
|
|
|
size_sum += l.data_size;
|
|
|
|
}
|
2015-03-01 22:53:15 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (s_textureCacheAbortLoading.IsSet())
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
2015-05-16 13:26:11 +00:00
|
|
|
|
|
|
|
if (size_sum > max_mem)
|
|
|
|
{
|
|
|
|
g_Config.bCacheHiresTextures = false;
|
|
|
|
|
|
|
|
OSD::AddMessage(StringFromFormat("Custom Textures prefetching after %.1f MB aborted, not enough RAM available", size_sum / (1024.0 * 1024.0)), 10000);
|
|
|
|
return;
|
|
|
|
}
|
2015-03-01 22:53:15 +00:00
|
|
|
}
|
|
|
|
u32 stoptime = Common::Timer::GetTimeMs();
|
|
|
|
OSD::AddMessage(StringFromFormat("Custom Textures loaded, %.1f MB in %.1f s", size_sum / (1024.0 * 1024.0), (stoptime - starttime) / 1000.0), 10000);
|
2009-07-06 02:10:26 +00:00
|
|
|
}
|
|
|
|
|
2015-01-15 20:33:22 +00:00
|
|
|
std::string HiresTexture::GenBaseName(const u8* texture, size_t texture_size, const u8* tlut, size_t tlut_size, u32 width, u32 height, int format, bool has_mipmaps, bool dump)
|
2012-05-12 12:31:38 +00:00
|
|
|
{
|
2015-01-14 22:19:10 +00:00
|
|
|
std::string name = "";
|
|
|
|
bool convert = false;
|
2015-01-14 20:53:05 +00:00
|
|
|
if (!dump && s_check_native_format)
|
2015-01-13 23:14:53 +00:00
|
|
|
{
|
2015-01-14 20:53:05 +00:00
|
|
|
// try to load the old format first
|
|
|
|
u64 tex_hash = GetHashHiresTexture(texture, (int)texture_size, g_ActiveConfig.iSafeTextureCache_ColorSamples);
|
|
|
|
u64 tlut_hash = tlut_size ? GetHashHiresTexture(tlut, (int)tlut_size, g_ActiveConfig.iSafeTextureCache_ColorSamples) : 0;
|
2015-06-12 11:56:53 +00:00
|
|
|
name = StringFromFormat("%s_%08x_%i", SConfig::GetInstance().m_strUniqueID.c_str(), (u32)(tex_hash ^ tlut_hash), (u16)format);
|
2015-01-14 20:53:05 +00:00
|
|
|
if (s_textureMap.find(name) != s_textureMap.end())
|
2015-01-14 22:19:10 +00:00
|
|
|
{
|
|
|
|
if (g_ActiveConfig.bConvertHiresTextures)
|
|
|
|
convert = true;
|
|
|
|
else
|
|
|
|
return name;
|
|
|
|
}
|
2015-01-13 23:14:53 +00:00
|
|
|
}
|
2015-01-14 20:53:05 +00:00
|
|
|
|
2015-01-14 22:19:10 +00:00
|
|
|
if (dump || s_check_new_format || convert)
|
2015-01-13 23:14:53 +00:00
|
|
|
{
|
2015-01-14 20:53:05 +00:00
|
|
|
// checking for min/max on paletted textures
|
|
|
|
u32 min = 0xffff;
|
|
|
|
u32 max = 0;
|
|
|
|
switch(tlut_size)
|
|
|
|
{
|
|
|
|
case 0: break;
|
|
|
|
case 16 * 2:
|
|
|
|
for (size_t i = 0; i < texture_size; i++)
|
|
|
|
{
|
|
|
|
min = std::min<u32>(min, texture[i] & 0xf);
|
|
|
|
min = std::min<u32>(min, texture[i] >> 4);
|
|
|
|
max = std::max<u32>(max, texture[i] & 0xf);
|
|
|
|
max = std::max<u32>(max, texture[i] >> 4);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 256 * 2:
|
|
|
|
for (size_t i = 0; i < texture_size; i++)
|
|
|
|
{
|
|
|
|
min = std::min<u32>(min, texture[i]);
|
|
|
|
max = std::max<u32>(max, texture[i]);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 16384 * 2:
|
|
|
|
for (size_t i = 0; i < texture_size/2; i++)
|
|
|
|
{
|
|
|
|
min = std::min<u32>(min, Common::swap16(((u16*)texture)[i]) & 0x3fff);
|
|
|
|
max = std::max<u32>(max, Common::swap16(((u16*)texture)[i]) & 0x3fff);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (tlut_size > 0)
|
|
|
|
{
|
|
|
|
tlut_size = 2 * (max + 1 - min);
|
|
|
|
tlut += 2 * min;
|
|
|
|
}
|
|
|
|
|
2015-01-21 20:45:14 +00:00
|
|
|
u64 tex_hash = XXH64(texture, texture_size, 0);
|
|
|
|
u64 tlut_hash = tlut_size ? XXH64(tlut, tlut_size, 0) : 0;
|
2015-01-13 23:14:53 +00:00
|
|
|
|
2015-01-21 22:06:18 +00:00
|
|
|
std::string basename = s_format_prefix + StringFromFormat("%dx%d%s_%016" PRIx64, width, height, has_mipmaps ? "_m" : "", tex_hash);
|
|
|
|
std::string tlutname = tlut_size ? StringFromFormat("_%016" PRIx64, tlut_hash) : "";
|
2015-01-14 20:53:05 +00:00
|
|
|
std::string formatname = StringFromFormat("_%d", format);
|
2015-01-14 22:19:10 +00:00
|
|
|
std::string fullname = basename + tlutname + formatname;
|
|
|
|
|
|
|
|
for (int level = 0; level < 10 && convert; level++)
|
|
|
|
{
|
|
|
|
std::string oldname = name;
|
|
|
|
if (level)
|
|
|
|
oldname += StringFromFormat("_mip%d", level);
|
|
|
|
|
|
|
|
// skip not existing levels
|
|
|
|
if (s_textureMap.find(oldname) == s_textureMap.end())
|
|
|
|
continue;
|
|
|
|
|
|
|
|
for (int i = 0;; i++)
|
|
|
|
{
|
|
|
|
// for hash collisions, padd with an integer
|
|
|
|
std::string newname = fullname;
|
|
|
|
if (level)
|
|
|
|
newname += StringFromFormat("_mip%d", level);
|
|
|
|
if (i)
|
|
|
|
newname += StringFromFormat(".%d", i);
|
|
|
|
|
|
|
|
// new texture
|
|
|
|
if (s_textureMap.find(newname) == s_textureMap.end())
|
|
|
|
{
|
|
|
|
std::string src = s_textureMap[oldname];
|
|
|
|
size_t postfix = src.find_last_of('.');
|
|
|
|
std::string dst = src.substr(0, postfix - oldname.length()) + newname + src.substr(postfix, src.length() - postfix);
|
|
|
|
if (File::Rename(src, dst))
|
|
|
|
{
|
|
|
|
s_textureMap.erase(oldname);
|
|
|
|
s_textureMap[newname] = dst;
|
|
|
|
s_check_new_format = true;
|
|
|
|
OSD::AddMessage(StringFromFormat("Rename custom texture %s to %s", oldname.c_str(), newname.c_str()), 5000);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
ERROR_LOG(VIDEO, "rename failed");
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
// dst fail already exist, compare content
|
|
|
|
std::string a, b;
|
|
|
|
File::ReadFileToString(s_textureMap[oldname], a);
|
|
|
|
File::ReadFileToString(s_textureMap[newname], b);
|
|
|
|
|
|
|
|
if (a == b && a != "")
|
|
|
|
{
|
|
|
|
// equal, so remove
|
|
|
|
if (File::Delete(s_textureMap[oldname]))
|
|
|
|
{
|
|
|
|
s_textureMap.erase(oldname);
|
|
|
|
OSD::AddMessage(StringFromFormat("Delete double old custom texture %s", oldname.c_str()), 5000);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
ERROR_LOG(VIDEO, "delete failed");
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
// else continue in this loop with the next higher padding variable
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2015-01-14 20:25:33 +00:00
|
|
|
|
2015-01-14 20:53:05 +00:00
|
|
|
// try to match a wildcard template
|
|
|
|
if (!dump && s_textureMap.find(basename + "_*" + formatname) != s_textureMap.end())
|
|
|
|
return basename + "_*" + formatname;
|
2015-01-14 20:25:33 +00:00
|
|
|
|
2015-01-14 20:53:05 +00:00
|
|
|
// else generate the complete texture
|
2015-01-14 22:19:10 +00:00
|
|
|
if (dump || s_textureMap.find(fullname) != s_textureMap.end())
|
|
|
|
return fullname;
|
2015-01-14 20:53:05 +00:00
|
|
|
}
|
2015-01-14 20:25:33 +00:00
|
|
|
|
2015-01-14 22:19:10 +00:00
|
|
|
return name;
|
2014-12-22 21:33:38 +00:00
|
|
|
}
|
|
|
|
|
2015-03-01 22:53:15 +00:00
|
|
|
std::shared_ptr<HiresTexture> HiresTexture::Search(const u8* texture, size_t texture_size, const u8* tlut, size_t tlut_size, u32 width, u32 height, int format, bool has_mipmaps)
|
2014-12-22 21:33:38 +00:00
|
|
|
{
|
2015-01-15 20:33:22 +00:00
|
|
|
std::string base_filename = GenBaseName(texture, texture_size, tlut, tlut_size, width, height, format, has_mipmaps);
|
2012-05-12 12:31:38 +00:00
|
|
|
|
2015-03-01 22:53:15 +00:00
|
|
|
std::lock_guard<std::mutex> lk2(s_textureCacheAquireMutex);
|
|
|
|
std::lock_guard<std::mutex> lk(s_textureCacheMutex);
|
|
|
|
|
|
|
|
auto iter = s_textureCache.find(base_filename);
|
|
|
|
if (iter != s_textureCache.end())
|
|
|
|
{
|
|
|
|
return iter->second;
|
|
|
|
}
|
|
|
|
|
|
|
|
std::shared_ptr<HiresTexture> ptr(Load(base_filename, width, height));
|
|
|
|
|
|
|
|
if (ptr && g_ActiveConfig.bCacheHiresTextures)
|
|
|
|
{
|
|
|
|
s_textureCache[base_filename] = ptr;
|
|
|
|
}
|
|
|
|
|
|
|
|
return ptr;
|
|
|
|
}
|
|
|
|
|
|
|
|
HiresTexture* HiresTexture::Load(const std::string& base_filename, u32 width, u32 height)
|
|
|
|
{
|
2014-12-22 11:53:03 +00:00
|
|
|
HiresTexture* ret = nullptr;
|
|
|
|
for (int level = 0;; level++)
|
|
|
|
{
|
|
|
|
std::string filename = base_filename;
|
|
|
|
if (level)
|
|
|
|
{
|
|
|
|
filename += StringFromFormat("_mip%u", level);
|
|
|
|
}
|
2009-07-06 02:10:26 +00:00
|
|
|
|
2015-01-14 20:53:05 +00:00
|
|
|
if (s_textureMap.find(filename) != s_textureMap.end())
|
2014-12-22 11:53:03 +00:00
|
|
|
{
|
|
|
|
Level l;
|
2009-07-06 02:10:26 +00:00
|
|
|
|
2014-12-22 11:53:03 +00:00
|
|
|
File::IOFile file;
|
2015-01-14 20:53:05 +00:00
|
|
|
file.Open(s_textureMap[filename], "rb");
|
2014-12-22 11:53:03 +00:00
|
|
|
std::vector<u8> buffer(file.GetSize());
|
|
|
|
file.ReadBytes(buffer.data(), file.GetSize());
|
2014-09-22 16:13:29 +00:00
|
|
|
|
2014-12-22 11:53:03 +00:00
|
|
|
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_size = (size_t)l.width * l.height * 4;
|
2014-09-22 16:13:29 +00:00
|
|
|
|
2014-12-22 11:53:03 +00:00
|
|
|
if (l.data == nullptr)
|
|
|
|
{
|
|
|
|
ERROR_LOG(VIDEO, "Custom texture %s failed to load", filename.c_str());
|
|
|
|
break;
|
|
|
|
}
|
2009-07-06 02:10:26 +00:00
|
|
|
|
2014-12-22 11:53:03 +00:00
|
|
|
if (!level)
|
|
|
|
{
|
|
|
|
if (l.width * height != l.height * width)
|
|
|
|
ERROR_LOG(VIDEO, "Invalid custom texture size %dx%d for texture %s. The aspect differs from the native size %dx%d.",
|
|
|
|
l.width, l.height, filename.c_str(), width, height);
|
2015-03-01 22:53:15 +00:00
|
|
|
if (width && height && (l.width % width || l.height % height))
|
2014-12-22 11:53:03 +00:00
|
|
|
WARN_LOG(VIDEO, "Invalid custom texture size %dx%d for texture %s. Please use an integer upscaling factor based on the native size %dx%d.",
|
|
|
|
l.width, l.height, filename.c_str(), width, height);
|
|
|
|
width = l.width;
|
|
|
|
height = l.height;
|
|
|
|
}
|
|
|
|
else if (width != l.width || height != l.height)
|
|
|
|
{
|
|
|
|
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);
|
|
|
|
break;
|
|
|
|
}
|
2009-07-06 02:10:26 +00:00
|
|
|
|
2014-12-22 11:53:03 +00:00
|
|
|
// calculate the size of the next mipmap
|
|
|
|
width >>= 1;
|
|
|
|
height >>= 1;
|
2009-07-06 02:10:26 +00:00
|
|
|
|
2014-12-22 11:53:03 +00:00
|
|
|
if (!ret)
|
|
|
|
ret = new HiresTexture();
|
|
|
|
ret->m_levels.push_back(l);
|
|
|
|
}
|
|
|
|
else
|
2009-07-06 02:10:26 +00:00
|
|
|
{
|
2014-12-22 11:53:03 +00:00
|
|
|
break;
|
2009-07-06 02:10:26 +00:00
|
|
|
}
|
|
|
|
}
|
2014-12-22 11:53:03 +00:00
|
|
|
|
|
|
|
return ret;
|
2009-07-06 02:10:26 +00:00
|
|
|
}
|
|
|
|
|
2014-12-22 11:53:03 +00:00
|
|
|
HiresTexture::~HiresTexture()
|
|
|
|
{
|
|
|
|
for (auto& l : m_levels)
|
|
|
|
{
|
|
|
|
SOIL_free_image_data(l.data);
|
|
|
|
}
|
2009-07-06 02:10:26 +00:00
|
|
|
}
|
2014-12-22 11:53:03 +00:00
|
|
|
|