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

rsx: Improve hardware texel remapping support

Browse source 
- Fixes issues observed when the remap is requested on a hardcoded channel
- In that scenario, fall back to software
This commit is contained in:
kd-11 2026-02-22 23:27:06 +03:00 committed by kd-11
parent cee868560a
commit 585305f434
2 changed files with 44 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
rpcs3/Emu/RSX/Common/TextureUtils.cpp
View file

@ -847,6 +847,16 @@ namespace rsx
}
}
bool texture_format_ex::hw_SNORM_possible() const
{
return (texel_remap_control & SEXT_MASK) == (get_host_format_snorm_mask(format()) << SEXT_OFFSET);
}
bool texture_format_ex::hw_SRGB_possible() const
{
return (texel_remap_control & GAMMA_CTRL_MASK) == GAMMA_RGB_MASK;
}
std::vector<rsx::subresource_layout> get_subresources_layout(const rsx::fragment_texture& texture)
{
return get_subresources_layout_impl(texture);
@ -1255,6 +1265,32 @@ namespace rsx
fmt::throw_exception("Unknown format 0x%x", texture_format);
}
/**
* Returns a channel mask in ARGB that can be SNORM-converted
* Some formats have a hardcoded constant in one lane which we cannot SNORM-interpret in hardware.
*/
u32 get_host_format_snorm_mask(u32 format)
{
switch (format)
{
case CELL_GCM_TEXTURE_B8:
case CELL_GCM_TEXTURE_R5G6B5:
case CELL_GCM_TEXTURE_R6G5B5:
case CELL_GCM_TEXTURE_D1R5G5B5:
case CELL_GCM_TEXTURE_D8R8G8B8:
case CELL_GCM_TEXTURE_COMPRESSED_B8R8_G8R8:
case CELL_GCM_TEXTURE_COMPRESSED_R8B8_R8G8:
// Hardcoded alpha formats
return 0b1110;
case CELL_GCM_TEXTURE_X16:
// This one is a mess. X and Z are hardcoded. Not supported.
// Fall through instead of throw
default:
return 0b1111;
}
}
/**
* A texture is stored as an array of blocks, where a block is a pixel for standard texture
* but is a structure containing several pixels for compressed format

10
rpcs3/Emu/RSX/Common/TextureUtils.h
View file

@ -147,8 +147,8 @@ namespace rsx
bool valid() const { return format_bits != 0; }
u32 format() const { return format_bits & ~(CELL_GCM_TEXTURE_LN | CELL_GCM_TEXTURE_UN); }
bool hw_SNORM_possible() const { return (texel_remap_control & SEXT_MASK) == SEXT_MASK; }
bool hw_SRGB_possible() const { return (texel_remap_control & GAMMA_CTRL_MASK) == GAMMA_RGB_MASK; }
bool hw_SNORM_possible() const;
bool hw_SRGB_possible() const;
//private:
u32 format_bits = 0;
@ -296,6 +296,12 @@ namespace rsx
*/
rsx::flags32_t get_format_features(u32 texture_format);
/**
* Returns a channel mask in ARGB that can be SNORM-converted
* Some formats have a hardcoded constant in one lane which we cannot SNORM-interpret in hardware.
*/
u32 get_host_format_snorm_mask(u32 format);
/**
* Returns number of texel rows encoded in one pitch-length line of bytes
*/