mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-01-30 12:32:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

rsx: Rewrite data texture remap expansion

Browse Source 
- 16-bit channel formats have special 0x4|0xE encoding for only 2 channels, not 4
- float textures do not take any remapping and crash if you try it.
  Depth float textures work fine though.
This commit is contained in:
kd-11 2020-05-13 00:09:20 +03:00 committed by kd-11
parent 12f0278808
commit 118bfbbe98
3 changed files with 39 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
rpcs3/Emu/RSX/GL/GLTexture.cpp
View File

@ -393,8 +393,7 @@ namespace gl
return{ GL_ONE, GL_RED, GL_RED, GL_RED };
case CELL_GCM_TEXTURE_X16:
//Blue component is also R (Mass Effect 3)
return{ GL_RED, GL_ONE, GL_RED, GL_RED };
return{ GL_RED, GL_ONE, GL_RED, GL_ONE };
case CELL_GCM_TEXTURE_X32_FLOAT:
return{ GL_RED, GL_RED, GL_RED, GL_RED };

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

@ -155,22 +155,51 @@ namespace rsx
switch (format() & ~(CELL_GCM_TEXTURE_LN | CELL_GCM_TEXTURE_UN))
{
case CELL_GCM_TEXTURE_X32_FLOAT:
case CELL_GCM_TEXTURE_W32_Z32_Y32_X32_FLOAT:
case CELL_GCM_TEXTURE_W16_Z16_Y16_X16_FLOAT:
{
// Floating point textures cannot be remapped on realhw, throws error 261
remap_ctl &= ~(0xFF);
remap_ctl |= 0xE4;
break;
}
case CELL_GCM_TEXTURE_Y16_X16_FLOAT:
{
// Floating point textures cannot be remapped on realhw, throws error 261
// High word of remap ctrl remaps ARGB to YXXX
const u32 lo_word = (remap_override) ? 0x56 : 0x66;
remap_ctl &= ~(0xFF);
remap_ctl |= lo_word;
break;
}
case CELL_GCM_TEXTURE_X16:
case CELL_GCM_TEXTURE_Y16_X16:
case CELL_GCM_TEXTURE_Y16_X16_FLOAT:
case CELL_GCM_TEXTURE_COMPRESSED_HILO8:
case CELL_GCM_TEXTURE_COMPRESSED_HILO_S8:
{
//Low bit in remap control 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)
//NOTE: The remap vector can also read from B-A-B-A in some cases (Mass Effect 3)
if (remap_override)
// These are special formats whose remap encoding is in 16-bit blocks
// 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
// This means only R and G channels exist for these formats
// 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)
// NOTE: The remap vector can also read from B-A-B-A in some cases (Mass Effect 3)
u32 lo_word = remap_ctl & 0xFF;
remap_ctl &= 0xFF00;
if (lo_word == 0xE4)
{
auto r_component = (remap_ctl >> 2) & 3;
remap_ctl = (remap_ctl & ~(3 << 4)) | r_component << 4;
lo_word = (remap_override) ? 0x56 : 0x66;
}
else
{
lo_word = (remap_override) ? 0xA9 : 0x99;
}
remap_ctl &= 0xFFFF;
remap_ctl |= lo_word;
break;
}
case CELL_GCM_TEXTURE_B8:

3
rpcs3/Emu/RSX/VK/VKFormats.cpp
View File

@ -187,8 +187,7 @@ namespace vk
mapping = { VK_COMPONENT_SWIZZLE_ONE, VK_COMPONENT_SWIZZLE_R, VK_COMPONENT_SWIZZLE_R, VK_COMPONENT_SWIZZLE_R }; break;
case CELL_GCM_TEXTURE_X16:
//Blue component is also R (Mass Effect 3)
mapping = { VK_COMPONENT_SWIZZLE_R, VK_COMPONENT_SWIZZLE_ONE, VK_COMPONENT_SWIZZLE_R, VK_COMPONENT_SWIZZLE_R }; break;
mapping = { VK_COMPONENT_SWIZZLE_R, VK_COMPONENT_SWIZZLE_ONE, VK_COMPONENT_SWIZZLE_R, VK_COMPONENT_SWIZZLE_ONE }; break;
case CELL_GCM_TEXTURE_X32_FLOAT:
mapping = { VK_COMPONENT_SWIZZLE_R, VK_COMPONENT_SWIZZLE_R, VK_COMPONENT_SWIZZLE_R, VK_COMPONENT_SWIZZLE_R }; break;