archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-10 17:01:24 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add end condition for VTC copy. This handles the case when depth is not a multiple of 4.

Browse source
This commit is contained in:
pauls-gh 2018-03-22 14:59:30 -07:00 • committed by kd-11
parent e6010ba2ca
commit e5b4710471
1 changed files with 23 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -62,7 +62,7 @@ struct copy_unmodified_block_vtc
u32 row_element_count = width_in_block * row_count;
u32 dst_offset = 0;
u32 src_offset = 0;
const u32 vtc_tile_row_count = 4;
const u32 depth_4 = (depth >> 2) * 4; // multiple of 4
// Undo Nvidia VTC tiling - place each 2D texture slice back to back in linear memory
//
@ -71,19 +71,22 @@ struct copy_unmodified_block_vtc
//
// Note that the memory is tiled 4 planes at a time in the depth direction.
// e.g. d0, d1, d2, d3 is tiled as a group then d4, d5, d6, d7
//
for (int d = 0; d < depth; d++)
//
// Tile as 4x4x4
for (int d = 0; d < depth_4; d++)
{
// Copy one slice of the 3d texture
for (u32 i = 0; i < row_element_count; i += 1)
{
copy(dst.subspan(dst_offset + i, 1), src.subspan(src_offset + i * vtc_tile_row_count, 1));
// Copy one span (8 bytes for DXT1 or 16 bytes for DXT5)
copy(dst.subspan(dst_offset + i, 1), src.subspan(src_offset + i * 4, 1));
}
dst_offset += row_element_count;
// Last plane in the group of 4?
if (d && ((d & (vtc_tile_row_count - 1)) == 0))
if (d && ((d & 3) == 0))
{
src_offset += row_element_count;
}
@ -92,6 +95,21 @@ struct copy_unmodified_block_vtc
src_offset += 1;
}
}
// End Case - tile as 4x4x3 or 4x4x2 or 4x4x1
const u32 vtc_tile_count = depth - depth_4;
for (int d = 0; d < vtc_tile_count; d++)
{
// Copy one slice of the 3d texture
for (u32 i = 0; i < row_element_count; i += 1)
{
// Copy one span (8 bytes for DXT1 or 16 bytes for DXT5)
copy(dst.subspan(dst_offset + i, 1), src.subspan(src_offset + i * vtc_tile_count, 1));
}
dst_offset += row_element_count;
src_offset += 1;
}
}
};