dahjah/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2026-06-04 05:45:03 -06:00
Code Issues Packages Projects Releases Wiki Activity

rsx: Fix data format remapping

Browse Source 
- Includes missing 0xEE and 0x44 variants of the 2-component data format remapper
This commit is contained in:
kd-11 2020-05-24 13:12:19 +03:00 committed by kd-11
parent bd41a108d8
commit 224a0e4b1a
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
rpcs3/Emu/RSX/RSXTexture.cpp
View File

@ -182,6 +182,7 @@ namespace rsx
// The first channel is encoded as 0x4 (combination of 0 and 1) and the second channel is 0xE (combination of 2 and 3) // The first channel is encoded as 0x4 (combination of 0 and 1) and the second channel is 0xE (combination of 2 and 3)
// There are only 2 valid combinations - 0xE4 or 0x4E, any attempts to mess with this will crash the system // There are only 2 valid combinations - 0xE4 or 0x4E, any attempts to mess with this will crash the system
// This means only R and G channels exist for these formats // This means only R and G channels exist for these formats
// Note that for the X16 format, 0xE refers to the "second" channel of a Y16_X16 format. 0xE is actually the existing data in this case
// Low bit in remap override (high word) affects whether the G component should match R and B components // Low bit in remap override (high word) affects whether the G component should match R and B components
// Components are usually interleaved R-G-R-G unless flag is set, then its R-R-R-G (Virtua Fighter 5) // Components are usually interleaved R-G-R-G unless flag is set, then its R-R-R-G (Virtua Fighter 5)
@ -190,13 +191,20 @@ namespace rsx
u32 lo_word = remap_ctl & 0xFF; u32 lo_word = remap_ctl & 0xFF;
remap_ctl &= 0xFF00; remap_ctl &= 0xFF00;
if (lo_word == 0xE4) switch (lo_word)
{ {
case 0xE4:
lo_word = (remap_override) ? 0x56 : 0x66; lo_word = (remap_override) ? 0x56 : 0x66;
} break;
else case 0x4E:
{
lo_word = (remap_override) ? 0xA9 : 0x99; lo_word = (remap_override) ? 0xA9 : 0x99;
break;
case 0xEE:
lo_word = 0xAA;
break;
case 0x44:
lo_word = 0x55;
break;
} }
remap_ctl |= lo_word; remap_ctl |= lo_word;
@ -204,12 +212,11 @@ namespace rsx
} }
case CELL_GCM_TEXTURE_B8: case CELL_GCM_TEXTURE_B8:
{ {
//Low bit in remap control seems to affect whether the A component is forced to 1 // Low bit in remap control seems to affect whether the A component is forced to 1
//Only seen in BLUS31604 // Only seen in BLUS31604
//TODO: Verify with a hardware test
if (remap_override) if (remap_override)
{ {
//Set remap lookup for A component to FORCE_ONE // Set remap lookup for A component to FORCE_ONE
remap_ctl = (remap_ctl & ~(3 << 8)) | (1 << 8); remap_ctl = (remap_ctl & ~(3 << 8)) | (1 << 8);
} }
break; break;