From 9512992fe20b352ce265a358ed9bcfd17d9a74fd Mon Sep 17 00:00:00 2001 From: Squall-Leonhart Date: Wed, 11 Oct 2023 18:19:35 +1100 Subject: Fix mistaken usage of info.block instead of level_info.block Fixed an error on my part, in the last change I had mistakenly passed unadjusted block info into FullUploadSwizzles and UnswizzleImage Revert (my mistaken changing of) the construction of SwizzleParameters in UnswizzleImage and FullUploadSwizzles to use level_info.block instead of info.block. This ensures that the block information used in the swizzling process is correctly adjusted for each mip level. --- src/video_core/texture_cache/util.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/video_core/texture_cache/util.cpp b/src/video_core/texture_cache/util.cpp index 0f8ef4277..652097a3d 100644 --- a/src/video_core/texture_cache/util.cpp +++ b/src/video_core/texture_cache/util.cpp @@ -885,7 +885,7 @@ boost::container::small_vector 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 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, -- cgit v1.2.3