RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2026-03-10 15:38:08 +01:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

rsx: Fix input-side vs output-side remapping flags

Browse source 
- Sign bit and biased renorm apply on input, Gamma on output
This commit is contained in:
kd-11 2026-02-15 16:46:32 +03:00 committed by kd-11
parent ed3d2a096c
commit 27fe5c6604
1 changed files with 30 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
rpcs3/Emu/RSX/RSXThread.cpp
View file

@ -2332,19 +2332,47 @@ namespace rsx
u32 unsigned_remap = 0;
u32 gamma = 0;
auto remap_channel_bits = [](const rsx::texture_channel_remap_t& remap, u32 bits) -> u32
{
if (!bits || remap.encoded == RSX_TEXTURE_REMAP_IDENTITY) [[ likely ]]
{
return bits;
}
u32 result = 0;
for (u8 channel = 0; channel < 4; ++channel)
{
switch (remap.control_map[channel])
{
case CELL_GCM_TEXTURE_REMAP_REMAP:
if (bits & (1u << remap.channel_map[channel]))
{
result |= (1u << channel);
}
break;
default:
break;
}
}
return result;
};
const auto texture_remap = tex.decoded_remap();
if (format_features & RSX_FORMAT_FEATURE_SIGNED_COMPONENTS)
{
argb8_signed = tex.argb_signed();
// Tests show this is applied pre-readout. It's just a property of the incoming bytes and is therefore subject to remap.
argb8_signed = remap_channel_bits(texture_remap, tex.argb_signed());
}
if (format_features & RSX_FORMAT_FEATURE_GAMMA_CORRECTION)
{
// Tests show this is applied post-readout. It's a property of the final value stored in the register and is not remapped. It overwrites even constant channels (REMAP_ZERO | REMAP_ONE)
gamma = tex.gamma() & ~(argb8_signed);
}
if (format_features & RSX_FORMAT_FEATURE_BIASED_NORMALIZATION)
{
// The renormalization flag applies to all channels
// The renormalization flag applies to all channels. It is weaker than the other flags.
unsigned_remap = (tex.unsigned_remap() == CELL_GCM_TEXTURE_UNSIGNED_REMAP_NORMAL) ? 0u : 0xF;
unsigned_remap &= ~(argb8_signed | gamma);
}