armsx/ARMSX2
0
0
Fork 0
mirror of https://github.com/ARMSX2/ARMSX2.git synced 2026-08-24 16:50:16 -07:00
Code Issues Packages Projects Releases Wiki Activity

GS: palette-relaxed replacement fallback (TEST BUILD, not for release)

Browse Source 
A paletted texture is looked up by TEX0 hash AND palette hash, so a pack only
applies while the game asks for a palette its packer happened to dump. The
Persona 3 FES logs land exactly there: the pack carries several palette variants
per glyph (ea34cb7b, df582335, b6eebe9e, 99b15967 ...) and the game asks for
cf4df1c018862d85, which is none of them. Every glyph misses while the unpaletted
art around it replaces fine -- 189 hits alongside 323 misses -- which is why the
scene looks right and the font does not.

Worth recording what this ISN'T, since each cost a round to eliminate: the cache
budget (already present in the working version), the pre-ELF hack strip
(transient, ApplyCoreSettings restores it), paltex (it relaxes the hash cache,
never the replacement lookup -- CreateTextureName always uses the real palette
hash for paletted formats), and name parsing, the hash function and the paltex
defaults, all byte-identical to 2.6.6.

So when the exact palette is missing but the pack holds this TEX0 under others,
take one -- lowest palette hash, so the choice is reproducible rather than
dependent on map iteration order.

NOT correct as shipped, and deliberately labelled so: the replacement image has
the packer's palette baked in, so substituted art can carry the wrong tint. It
exists to answer one question. If the mods appear, the palette hash was the only
obstacle and the real fix is about WHICH palette to prefer, not about loading at
all. If they still do not appear, the pack was never the whole story.
This commit is contained in:
jpolo1224
2026-08-21 18:37:38 -04:00
parent ddcfd39dab
commit d9252de06e
1 changed files with 45 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pcsx2/GS/Renderers/HW/GSTextureReplacements.cpp
+45
View File
@@ -523,6 +523,7 @@ static u64 s_lookup_hits = 0;
static u64 s_lookup_misses = 0;
static u64 s_lookup_clut_only_misses = 0;
static u64 s_lookup_next_report = 0;
static u64 s_palette_fallbacks = 0;
void GSTextureReplacements::ReloadReplacementMap()
{
@@ -534,6 +535,7 @@ void GSTextureReplacements::ReloadReplacementMap()
s_lookup_misses = 0;
s_lookup_clut_only_misses = 0;
s_lookup_next_report = 0;
s_palette_fallbacks = 0;
// clear out the caches
{
@@ -786,6 +788,49 @@ GSTexture* GSTextureReplacements::LookupReplacementTexture(const GSTextureCache:
// replacement for this name exists?
auto fnit = s_replacement_texture_filenames.find(name);
// ★ TEST BUILD ONLY -- palette-relaxed fallback.
//
// A paletted texture is looked up by TEX0 hash AND palette hash, so a pack only applies while
// the game asks for a palette the packer happened to dump. Persona 3 FES mods break exactly
// here: the pack carries several palette variants per glyph and the game asks for one that is
// not among them, so every glyph misses while the unpaletted art around it replaces fine.
//
// When the exact palette is absent but the pack holds this same TEX0 under others, take one.
// Deterministically the lowest palette hash, so two runs pick the same file and the result is
// reproducible rather than dependent on map order.
//
// This is NOT correct as shipped: the replacement image has the packer's palette baked into it,
// so the substituted art can carry the wrong tint. It is here to answer one question -- if the
// mods appear, then the palette hash was the only thing standing in the way, and the real fix
// is about which palette to prefer, not about loading at all.
if (fnit == s_replacement_texture_filenames.end() && name.HasPalette())
{
const TextureName* best = nullptr;
const std::string* best_file = nullptr;
for (const auto& it : s_replacement_texture_filenames)
{
if (it.first.TEX0Hash != name.TEX0Hash || it.first.bits != name.bits ||
it.first.region_width != name.region_width || it.first.region_height != name.region_height)
continue;
if (!best || it.first.CLUTHash < best->CLUTHash)
{
best = &it.first;
best_file = &it.second;
}
}
if (best)
{
if (s_palette_fallbacks < 8)
{
Console.WriteLnFmt("Texture replacements: PALETTE FALLBACK tex0={:016x} wanted clut={:016x}, using '{}'",
name.TEX0Hash, name.CLUTHash, Path::GetFileName(*best_file));
}
s_palette_fallbacks++;
fnit = s_replacement_texture_filenames.find(*best);
}
}
if (fnit == s_replacement_texture_filenames.end())
{
// ★ The second half of the "my pack does nothing" diagnosis, and the half that was