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

Compressed textures apparently don't have to have a height multiple of 32 either.

This commit is contained in:
gibbed 2017-03-11 23:40:43 -06:00
parent c0ee30c6b4
commit 5875b79cc4
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/xenia/gpu/texture_info.cc
View File

@ -212,18 +212,20 @@ void TextureInfo::CalculateTextureSizes2D(const xe_gpu_texture_fetch_t& fetch) {
format_info->block_height; format_info->block_height;
// Tiles are 32x32 blocks. All textures must be multiples of tile dimensions. // Tiles are 32x32 blocks. All textures must be multiples of tile dimensions.
// ...except linear textures don't seem to need a multiple of 32 for height. // ...except textures don't seem to need a multiple of 32 for height.
uint32_t tile_width = uint32_t(std::ceil(block_width / 32.0f)); uint32_t tile_width = uint32_t(std::ceil(block_width / 32.0f));
uint32_t tile_height = uint32_t(std::ceil(block_height / 32.0f)); uint32_t tile_height = uint32_t(std::ceil(block_height / 32.0f));
size_2d.block_width = tile_width * 32; size_2d.block_width = tile_width * 32;
size_2d.block_height = format_info->type == FormatType::kCompressed size_2d.block_height =
/*format_info->type == FormatType::kCompressed
? tile_height * 32 ? tile_height * 32
: block_height; :*/ block_height;
uint32_t bytes_per_block = format_info->block_width * uint32_t bytes_per_block = format_info->block_width *
format_info->block_height * format_info->block_height *
format_info->bits_per_pixel / 8; format_info->bits_per_pixel / 8;
uint32_t byte_pitch = size_2d.block_width * bytes_per_block; uint32_t byte_pitch = size_2d.block_width * bytes_per_block;
if (!is_tiled) { if (!is_tiled) {
// Each row must be a multiple of 256 in linear textures. // Each row must be a multiple of 256 in linear textures.
byte_pitch = xe::round_up(byte_pitch, 256); byte_pitch = xe::round_up(byte_pitch, 256);