diff options
| author |  liamwhite | 2023-05-09 09:47:22 -0400 |
|---|---|---|
| committer |  GitHub | 2023-05-09 09:47:22 -0400 |
| commit | 1f14b58315f807f62aeb31d0c23b859b501324b7 (patch) | |
| tree | e5625e146ea3127cd3daf99d6abe3386af1de300 /src/video_core/texture_cache | |
| parent | Merge pull request #10208 from german77/amiibo_joycon (diff) | |
| parent | Texture Cache: Fix ASTC textures (diff) | |
| download | yuzu-1f14b58315f807f62aeb31d0c23b859b501324b7.tar.gz yuzu-1f14b58315f807f62aeb31d0c23b859b501324b7.tar.xz yuzu-1f14b58315f807f62aeb31d0c23b859b501324b7.zip | |
Merge pull request #10206 from FernandoS27/astc-3d
Texture Cache: Fix 3D ASTC textures
Diffstat (limited to 'src/video_core/texture_cache')
| -rw-r--r-- | src/video_core/texture_cache/util.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/video_core/texture_cache/util.cpp b/src/video_core/texture_cache/util.cpp index de37db684..f1071aa23 100644 --- a/src/video_core/texture_cache/util.cpp +++ b/src/video_core/texture_cache/util.cpp | |||
| @@ -896,11 +896,11 @@ void ConvertImage(std::span<const u8> input, const ImageInfo& info, std::span<u8 | |||
| 896 | ASSERT(copy.buffer_row_length == Common::AlignUp(mip_size.width, tile_size.width)); | 896 | ASSERT(copy.buffer_row_length == Common::AlignUp(mip_size.width, tile_size.width)); |
| 897 | ASSERT(copy.buffer_image_height == Common::AlignUp(mip_size.height, tile_size.height)); | 897 | ASSERT(copy.buffer_image_height == Common::AlignUp(mip_size.height, tile_size.height)); |
| 898 | if (IsPixelFormatASTC(info.format)) { | 898 | if (IsPixelFormatASTC(info.format)) { |
| 899 | ASSERT(copy.image_extent.depth == 1); | 899 | Tegra::Texture::ASTC::Decompress( |
| 900 | Tegra::Texture::ASTC::Decompress(input.subspan(copy.buffer_offset), | 900 | input.subspan(copy.buffer_offset), copy.image_extent.width, |
| 901 | copy.image_extent.width, copy.image_extent.height, | 901 | copy.image_extent.height, |
| 902 | copy.image_subresource.num_layers, tile_size.width, | 902 | copy.image_subresource.num_layers * copy.image_extent.depth, tile_size.width, |
| 903 | tile_size.height, output.subspan(output_offset)); | 903 | tile_size.height, output.subspan(output_offset)); |
| 904 | } else { | 904 | } else { |
| 905 | DecompressBC4(input.subspan(copy.buffer_offset), copy.image_extent, | 905 | DecompressBC4(input.subspan(copy.buffer_offset), copy.image_extent, |
| 906 | output.subspan(output_offset)); | 906 | output.subspan(output_offset)); |