From bc3c49bc287fc396a96b5032ecee469ea3b6925b Mon Sep 17 00:00:00 2001 From: MrPurple666 Date: Fri, 10 Feb 2023 02:02:43 -0300 Subject: [PATCH] Add TIC format: 0x58D24946 Cult of the Lamb must be in-game and should fix some textures in Bayonetta 3 Co-authored-by: neogan-bot --- .../main/cpp/skyline/gpu/interconnect/common/textures.cpp | 4 +++- app/src/main/cpp/skyline/gpu/texture/format.h | 5 +++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/app/src/main/cpp/skyline/gpu/interconnect/common/textures.cpp b/app/src/main/cpp/skyline/gpu/interconnect/common/textures.cpp index b6d57a07..333f6c20 100644 --- a/app/src/main/cpp/skyline/gpu/interconnect/common/textures.cpp +++ b/app/src/main/cpp/skyline/gpu/interconnect/common/textures.cpp @@ -129,6 +129,8 @@ namespace skyline::gpu::interconnect { TIC_FORMAT_CASE_ST_SRGB(Astc10x8, Astc10x8, Unorm); TIC_FORMAT_CASE_ST(Astc10x10, Astc10x10, Unorm); TIC_FORMAT_CASE_ST_SRGB(Astc10x10, Astc10x10, Unorm); + TIC_FORMAT_CASE_ST(Astc12x12, Astc12x12, Unorm); + TIC_FORMAT_CASE_ST_SRGB(Astc12x12, Astc12x12, Unorm); TIC_FORMAT_CASE_ST(BC2, BC2, Unorm); TIC_FORMAT_CASE_ST_SRGB(BC2, BC2, Unorm); TIC_FORMAT_CASE_ST(BC3, BC3, Unorm); @@ -367,4 +369,4 @@ namespace skyline::gpu::interconnect { return Shader::TextureType::ColorArrayCube; } } -} \ No newline at end of file +} diff --git a/app/src/main/cpp/skyline/gpu/texture/format.h b/app/src/main/cpp/skyline/gpu/texture/format.h index 4b5a642c..81dcf480 100644 --- a/app/src/main/cpp/skyline/gpu/texture/format.h +++ b/app/src/main/cpp/skyline/gpu/texture/format.h @@ -158,6 +158,11 @@ namespace skyline::gpu::format { .blockHeight = 10 ); + FORMAT_SUFF_UNORM_SRGB(Astc12x12, 128, eAstc12x12, Block, + .blockWidth = 12, + .blockHeight = 12 + ); + // Depth/Stencil Formats // All of these have a G->R swizzle FORMAT(D16Unorm, 16, eD16Unorm, vka::eDepth, .swizzleMapping = {