ShuriZma
/
xenia-canary
mirror of https://github.com/xenia-canary/xenia-canary.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Vulkan] Fix block pitch calculation of mips

This commit is contained in:
Dr. Chat 2018-05-04 00:18:45 -05:00
parent 8ecadd49d2
commit 7a3d0b683b
1 changed files with 15 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/xenia/gpu/vulkan/texture_cache.cc
View File

@ -882,40 +882,32 @@ bool TextureCache::ConvertTexture2D(uint8_t* dest,
TextureInfo::GetMipLocation(src, mip, &offset_x, &offset_y); TextureInfo::GetMipLocation(src, mip, &offset_x, &offset_y);
void* host_address = memory_->TranslatePhysical(address); void* host_address = memory_->TranslatePhysical(address);
// Pitch of the source texture in blocks.
uint32_t block_width = mip == 0
? src.size_2d.block_width
: xe::next_pow2(src.size_2d.block_width) >> mip;
uint32_t logical_width = src.size_2d.logical_width >> mip; uint32_t logical_width = src.size_2d.logical_width >> mip;
uint32_t logical_height = src.size_2d.logical_height >> mip; uint32_t logical_height = src.size_2d.logical_height >> mip;
uint32_t block_width = src.size_2d.block_width >> mip;
uint32_t input_width = src.size_2d.input_width >> mip; uint32_t input_width = src.size_2d.input_width >> mip;
uint32_t input_height = src.size_2d.input_height >> mip; uint32_t input_height = src.size_2d.input_height >> mip;
// All dimensions must be a multiple of block w/h // All dimensions must be a multiple of block w/h
logical_width = std::max(logical_width, src.format_info()->block_width); logical_width = xe::round_up(logical_width, src.format_info()->block_width);
logical_height = std::max(logical_height, src.format_info()->block_height); logical_height =
xe::round_up(logical_height, src.format_info()->block_height);
input_width = xe::round_up(input_width, src.format_info()->block_width); input_width = xe::round_up(input_width, src.format_info()->block_width);
input_height = xe::round_up(input_height, src.format_info()->block_height); input_height = xe::round_up(input_height, src.format_info()->block_height);
if (!src.is_tiled) { if (!src.is_tiled) {
uint32_t offset_x, offset_y; uint32_t bytes_per_block = src.format_info()->block_width *
if (src.has_packed_mips && src.format_info()->block_height *
TextureInfo::GetPackedTileOffset(src, &offset_x, &offset_y)) { src.format_info()->bits_per_pixel / 8;
uint32_t bytes_per_block = src.format_info()->block_width *
src.format_info()->block_height *
src.format_info()->bits_per_pixel / 8;
const uint8_t* src_mem = reinterpret_cast<const uint8_t*>(host_address); const uint8_t* src_mem = reinterpret_cast<const uint8_t*>(host_address);
src_mem += offset_y * src.size_2d.input_pitch; src_mem += offset_y * src.size_2d.input_pitch;
src_mem += offset_x * bytes_per_block; src_mem += offset_x * bytes_per_block;
for (uint32_t y = 0; TextureSwap(src.endianness, dest, src_mem,
y < std::min(src.size_2d.block_height, src.size_2d.logical_height); src.size_2d.input_pitch * src.size_2d.logical_height);
y++) {
TextureSwap(src.endianness, dest, src_mem, src.size_2d.input_pitch);
src_mem += src.size_2d.input_pitch;
dest += src.size_2d.input_pitch;
}
} else {
// Fast path copy entire image.
TextureSwap(src.endianness, dest, host_address, src.input_length);
}
} else { } else {
// Untile image. // Untile image.
// We could do this in a shader to speed things up, as this is pretty // We could do this in a shader to speed things up, as this is pretty