From bc509c85e4d52a5c874a58f0a1109b3aefb48c1d Mon Sep 17 00:00:00 2001 From: Liam Date: Thu, 12 Oct 2023 08:51:29 -0400 Subject: [PATCH] Revert "Merge pull request #11743 from Squall-Leonhart/IFREMOVED" This reverts commit b6d19329ac710f82c424b433dcd108adad3da9b1, reversing changes made to 36ea7565faa9c81e6eaa937f560fbe159d23ae01. --- 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 8151cabf03..2e8160db07 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, level_info.block, level, level_info.num_levels); + AdjustMipBlockSize(num_tiles, 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, level_info.block, level, level_info.num_levels); + AdjustMipBlockSize(num_tiles, info.block, level, level_info.num_levels); params[level] = SwizzleParameters{ .num_tiles = num_tiles, .block = block,