diff options
Diffstat (limited to 'Source/Core/VideoCommon/HiresTextures.cpp')
| -rw-r--r-- | Source/Core/VideoCommon/HiresTextures.cpp | 185 |
1 files changed, 165 insertions, 20 deletions
diff --git a/Source/Core/VideoCommon/HiresTextures.cpp b/Source/Core/VideoCommon/HiresTextures.cpp index 633e6407a9..9483fe3b3f 100644 --- a/Source/Core/VideoCommon/HiresTextures.cpp +++ b/Source/Core/VideoCommon/HiresTextures.cpp @@ -3,9 +3,11 @@ // Refer to the license.txt file included. #include <algorithm> +#include <cinttypes> #include <cstring> #include <string> #include <utility> +#include <xxhash.h> #include <SOIL/SOIL.h> #include "Common/CommonPaths.h" @@ -16,13 +18,20 @@ #include "Core/ConfigManager.h" #include "VideoCommon/HiresTextures.h" +#include "VideoCommon/OnScreenDisplay.h" #include "VideoCommon/VideoConfig.h" -std::unordered_map<std::string, std::string> HiresTexture::textureMap; +static std::unordered_map<std::string, std::string> s_textureMap; +static bool s_check_native_format; +static bool s_check_new_format; + +static const std::string s_format_prefix = "tex1_"; void HiresTexture::Init(const std::string& gameCode) { - textureMap.clear(); + s_textureMap.clear(); + s_check_native_format = false; + s_check_new_format = false; CFileSearch::XStringVector Directories; @@ -66,36 +75,172 @@ void HiresTexture::Init(const std::string& gameCode) const CFileSearch::XStringVector& rFilenames = FileSearch.GetFileNames(); const std::string code = StringFromFormat("%s_", gameCode.c_str()); + const std::string code2 = ""; - if (rFilenames.size() > 0) + for (auto& rFilename : rFilenames) { - for (auto& rFilename : rFilenames) + std::string FileName; + SplitPath(rFilename, nullptr, &FileName, nullptr); + + if (FileName.substr(0, code.length()) == code) { - std::string FileName; - SplitPath(rFilename, nullptr, &FileName, nullptr); + s_textureMap[FileName] = rFilename; + s_check_native_format = true; + } - if (FileName.substr(0, code.length()).compare(code) == 0 && textureMap.find(FileName) == textureMap.end()) - textureMap.insert(std::map<std::string, std::string>::value_type(FileName, rFilename)); + if (FileName.substr(0, s_format_prefix.length()) == s_format_prefix) + { + s_textureMap[FileName] = rFilename; + s_check_new_format = true; } } } -std::string HiresTexture::GenBaseName(const u8* texture, size_t texture_size, const u8* tlut, size_t tlut_size, u32 width, u32 height, int format) +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) { - u64 tex_hash = GetHashHiresTexture(texture, (int)texture_size, g_ActiveConfig.iSafeTextureCache_ColorSamples); - u64 tlut_hash = 0; - u64 hash = tex_hash; - if (tlut_size) + std::string name = ""; + bool convert = false; + if (!dump && s_check_native_format) + { + // 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; + name = StringFromFormat("%s_%08x_%i", SConfig::GetInstance().m_LocalCoreStartupParameter.m_strUniqueID.c_str(), (u32)(tex_hash ^ tlut_hash), (u16)format); + if (s_textureMap.find(name) != s_textureMap.end()) + { + if (g_ActiveConfig.bConvertHiresTextures) + convert = true; + else + return name; + } + } + + if (dump || s_check_new_format || convert) { - tlut_hash = GetHashHiresTexture(tlut, (int)tlut_size, g_ActiveConfig.iSafeTextureCache_ColorSamples); - hash ^= tlut_hash; + // 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; + } + + u64 tex_hash = XXH64(texture, texture_size, 0); + u64 tlut_hash = tlut_size ? XXH64(tlut, tlut_size, 0) : 0; + + 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) : ""; + std::string formatname = StringFromFormat("_%d", format); + 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 + } + } + } + + // try to match a wildcard template + if (!dump && s_textureMap.find(basename + "_*" + formatname) != s_textureMap.end()) + return basename + "_*" + formatname; + + // else generate the complete texture + if (dump || s_textureMap.find(fullname) != s_textureMap.end()) + return fullname; } - return StringFromFormat("%s_%08x_%i", SConfig::GetInstance().m_LocalCoreStartupParameter.m_strUniqueID.c_str(), (u32)hash, (u16)format); + + return name; } -HiresTexture* HiresTexture::Search(const u8* texture, size_t texture_size, const u8* tlut, size_t tlut_size, u32 width, u32 height, int format) +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) { - std::string base_filename = GenBaseName(texture, texture_size, tlut, tlut_size, width, height, format); + std::string base_filename = GenBaseName(texture, texture_size, tlut, tlut_size, width, height, format, has_mipmaps); HiresTexture* ret = nullptr; for (int level = 0;; level++) @@ -106,12 +251,12 @@ HiresTexture* HiresTexture::Search(const u8* texture, size_t texture_size, const filename += StringFromFormat("_mip%u", level); } - if (textureMap.find(filename) != textureMap.end()) + if (s_textureMap.find(filename) != s_textureMap.end()) { Level l; File::IOFile file; - file.Open(textureMap[filename], "rb"); + file.Open(s_textureMap[filename], "rb"); std::vector<u8> buffer(file.GetSize()); file.ReadBytes(buffer.data(), file.GetSize()); |