Browse Source
Merge pull request #11743 from Squall-Leonhart/IFREMOVED
Fix mistaken usage of info.block instead of level_info.block
pull/15/merge
Fernando S
2 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
2 additions and
2 deletions
-
src/video_core/texture_cache/util.cpp
|
|
|
@ -885,7 +885,7 @@ boost::container::small_vector<BufferImageCopy, 16> UnswizzleImage(Tegra::Memory |
|
|
|
}; |
|
|
|
const Extent3D num_tiles = AdjustTileSize(level_size, tile_size); |
|
|
|
const Extent3D block = |
|
|
|
AdjustMipBlockSize(num_tiles, info.block, level, level_info.num_levels); |
|
|
|
AdjustMipBlockSize(num_tiles, level_info.block, level, level_info.num_levels); |
|
|
|
const u32 stride_alignment = StrideAlignment(num_tiles, info.block, gob, bpp_log2); |
|
|
|
size_t guest_layer_offset = 0; |
|
|
|
|
|
|
|
@ -1062,7 +1062,7 @@ boost::container::small_vector<SwizzleParameters, 16> FullUploadSwizzles(const I |
|
|
|
const Extent3D level_size = AdjustMipSize(size, level); |
|
|
|
const Extent3D num_tiles = AdjustTileSize(level_size, tile_size); |
|
|
|
const Extent3D block = |
|
|
|
AdjustMipBlockSize(num_tiles, info.block, level, level_info.num_levels); |
|
|
|
AdjustMipBlockSize(num_tiles, level_info.block, level, level_info.num_levels); |
|
|
|
params[level] = SwizzleParameters{ |
|
|
|
.num_tiles = num_tiles, |
|
|
|
.block = block, |
|
|
|
|