mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-02-11 06:40:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

rsx: Configure pitch correctly for pitch-zero textures (1D)

Browse Source
This commit is contained in:
kd-11 2021-11-03 00:19:03 +03:00 committed by kd-11
parent 69f321a471
commit ad00c44231
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
rpcs3/Emu/RSX/Common/TextureUtils.cpp
View File

@ -560,7 +560,7 @@ std::vector<rsx::subresource_layout> get_subresources_layout_impl(const RsxTextu
std::tie(h, depth, layer) = get_height_depth_layer(texture); std::tie(h, depth, layer) = get_height_depth_layer(texture);
const auto format = texture.format() & ~(CELL_GCM_TEXTURE_LN | CELL_GCM_TEXTURE_UN); const auto format = texture.format() & ~(CELL_GCM_TEXTURE_LN | CELL_GCM_TEXTURE_UN);
const auto pitch = texture.pitch(); auto pitch = texture.pitch();
const u32 texaddr = rsx::get_address(texture.offset(), texture.location()); const u32 texaddr = rsx::get_address(texture.offset(), texture.location());
auto pixels = vm::_ptr<const std::byte>(texaddr); auto pixels = vm::_ptr<const std::byte>(texaddr);
@ -570,17 +570,18 @@ std::vector<rsx::subresource_layout> get_subresources_layout_impl(const RsxTextu
if (!is_swizzled) if (!is_swizzled)
{ {
if (pitch) [[likely]] if (const auto packed_pitch = rsx::get_format_packed_pitch(format, w, has_border, false); pitch < packed_pitch) [[unlikely]]
{ {
if (pitch < rsx::get_format_packed_pitch(format, w, has_border, false)) if (pitch)
{ {
const u32 real_width_in_block = pitch / rsx::get_format_block_size_in_bytes(format); const u32 real_width_in_block = pitch / rsx::get_format_block_size_in_bytes(format);
w = std::max<u16>(real_width_in_block * rsx::get_format_block_size_in_texel(format), 1); w = std::max<u16>(real_width_in_block * rsx::get_format_block_size_in_texel(format), 1);
} }
} else
else {
{ h = depth = 1;
h = depth = 1; pitch = packed_pitch;
}
} }
} }