dolphin-emu/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-10-07 07:43:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #9711 from iwubcode/enhance-wildcard-support

Browse Source 
VideoCommon: enhance wildcard support in hi res texture lookup
This commit is contained in:
JMC47 2021-06-20 04:01:19 -04:00 committed by GitHub
commit c788beecfc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 31 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -221,20 +221,29 @@ std::string HiresTexture::GenBaseName(TextureInfo& texture_info, bool dump)
const auto texture_name_details = texture_info.CalculateTextureName();
// try to match a wildcard template
if (!dump)
{
const std::string texture_name =
fmt::format("{}_${}", texture_name_details.base_name, texture_name_details.format_name);
if (s_textureMap.find(texture_name) != s_textureMap.end())
return texture_name;
}
// else generate the complete texture
// look for an exact match first
const std::string full_name = texture_name_details.GetFullName();
if (dump || s_textureMap.find(full_name) != s_textureMap.end())
return full_name;
// else try and find a wildcard
if (!dump)
{
// Single wildcard ignoring the tlut hash
const std::string texture_name_single_wildcard_tlut =
fmt::format("{}_{}_$_{}", texture_name_details.base_name, texture_name_details.texture_name,
texture_name_details.format_name);
if (s_textureMap.find(texture_name_single_wildcard_tlut) != s_textureMap.end())
return texture_name_single_wildcard_tlut;
// Single wildcard ignoring the texture hash
const std::string texture_name_single_wildcard_tex =
fmt::format("{}_${}_{}", texture_name_details.base_name, texture_name_details.tlut_name,
texture_name_details.format_name);
if (s_textureMap.find(texture_name_single_wildcard_tex) != s_textureMap.end())
return texture_name_single_wildcard_tex;
}
return "";
}

13
Source/Core/VideoCommon/TextureInfo.cpp
View File

@ -4,6 +4,7 @@
#include "VideoCommon/TextureInfo.h"
#include <fmt/format.h>
#include <xxhash.h>
#include "Common/Align.h"
@ -95,6 +96,11 @@ TextureInfo::TextureInfo(const u8* ptr, const u8* tlut_ptr, u32 address,
}
}
std::string TextureInfo::NameDetails::GetFullName() const
{
return fmt::format("{}_{}{}_{}", base_name, texture_name, tlut_name, format_name);
}
TextureInfo::NameDetails TextureInfo::CalculateTextureName()
{
if (!m_ptr)
@ -151,10 +157,11 @@ TextureInfo::NameDetails TextureInfo::CalculateTextureName()
const u64 tlut_hash = tlut_size ? XXH64(tlut, tlut_size, 0) : 0;
NameDetails result;
result.base_name = fmt::format("{}{}x{}{}_{:016x}", format_prefix, m_raw_width, m_raw_height,
m_mipmaps_enabled ? "_m" : "", tex_hash);
result.base_name = fmt::format("{}{}x{}{}", format_prefix, m_raw_width, m_raw_height,
m_mipmaps_enabled ? "_m" : "");
result.texture_name = fmt::format("{:016x}", tex_hash);
result.tlut_name = tlut_size ? fmt::format("_{:016x}", tlut_hash) : "";
result.format_name = fmt::format("_{}", static_cast<int>(m_texture_format));
result.format_name = fmt::to_string(static_cast<int>(m_texture_format));
return result;
}

3
Source/Core/VideoCommon/TextureInfo.h
View File

@ -25,10 +25,11 @@ public:
struct NameDetails
{
std::string base_name;
std::string texture_name;
std::string tlut_name;
std::string format_name;
std::string GetFullName() const { return base_name + tlut_name + format_name; }
std::string GetFullName() const;
};
NameDetails CalculateTextureName();