Impaczus/rpcs3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rsx: Make BX2 flag respect constant overrides

Browse Source
This commit is contained in:
kd-11
2026-02-15 18:15:42 +03:00
committed by kd-11
parent 8a1b323749
commit b30a44c136
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXFragmentTextureOps.glsl
+1 -1
View File
@@ -34,7 +34,7 @@ R"(
#define _enable_texture_expand(index) \ #define _enable_texture_expand(index) \
do { \ do { \
if (_test_bit(TEX_PARAM(index).flags, FORMAT_FEATURE_BIASED_RENORMALIZATION_BIT)) { \ if (_test_bit(TEX_PARAM(index).flags, FORMAT_FEATURE_BIASED_RENORMALIZATION_BIT)) { \
_texture_flag_override = SIGN_EXPAND_MASK; \ _texture_flag_override = SIGN_EXPAND_MASK & (_get_bits(TEX_PARAM(index).remap, 16, 4) << EXPAND_A_BIT); \
_texture_flag_erase = GAMMA_CTRL_MASK; \ _texture_flag_erase = GAMMA_CTRL_MASK; \
_texture_bx2_active = true; \ _texture_bx2_active = true; \
} \ } \
rpcs3/Emu/RSX/RSXThread.cpp
+14 -3
View File
@@ -2366,15 +2366,19 @@ namespace rsx
if (format_features & RSX_FORMAT_FEATURE_GAMMA_CORRECTION) 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) // Tests show this is applied post-readout. It's a property of the final value stored in the register and is not remapped.
// NOTE: GAMMA correction has no algorithmic effect on constants (0 and 1) so we need not mask it out for correctness.
gamma = tex.gamma() & ~(argb8_signed); gamma = tex.gamma() & ~(argb8_signed);
} }
if (format_features & RSX_FORMAT_FEATURE_BIASED_NORMALIZATION) if (format_features & RSX_FORMAT_FEATURE_BIASED_NORMALIZATION)
{ {
// The renormalization flag applies to all channels. It is weaker than the other flags. // 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; // This applies on input and is subject to remap overrides
unsigned_remap &= ~(argb8_signed | gamma); if (tex.unsigned_remap() == CELL_GCM_TEXTURE_UNSIGNED_REMAP_BIASED)
{
unsigned_remap = remap_channel_bits(texture_remap, 0xF) & ~(argb8_signed | gamma);
}
} }
u32 argb8_convert = gamma; u32 argb8_convert = gamma;
@@ -2390,6 +2394,13 @@ namespace rsx
texture_control |= argb8_convert; texture_control |= argb8_convert;
texture_control |= format_features << texture_control_bits::FORMAT_FEATURES_OFFSET; texture_control |= format_features << texture_control_bits::FORMAT_FEATURES_OFFSET;
if (current_fp_metadata.has_tex_bx2_conv)
{
const u32 remap_hi = remap_channel_bits(texture_remap, 0xFu);
current_fragment_program.texture_params[i].remap &= ~(0xFu << 16u);
current_fragment_program.texture_params[i].remap |= (remap_hi << 16u);
}
} }
current_fragment_program.texture_params[i].control = texture_control; current_fragment_program.texture_params[i].control = texture_control;