From deb7a0e22a52b702006e7600cfaba8905033aa9b Mon Sep 17 00:00:00 2001 From: Billy Laws Date: Sat, 4 Jun 2022 17:42:37 +0100 Subject: [PATCH] Implement 5x5 and 10x10 ASTC texture formats --- .../main/cpp/skyline/gpu/interconnect/graphics_context.h | 4 ++++ app/src/main/cpp/skyline/gpu/texture/format.h | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/app/src/main/cpp/skyline/gpu/interconnect/graphics_context.h b/app/src/main/cpp/skyline/gpu/interconnect/graphics_context.h index 264c8a38..38cb6958 100644 --- a/app/src/main/cpp/skyline/gpu/interconnect/graphics_context.h +++ b/app/src/main/cpp/skyline/gpu/interconnect/graphics_context.h @@ -2173,10 +2173,14 @@ namespace skyline::gpu::interconnect { TIC_FORMAT_CASE_ST(Astc4x4, Astc4x4, Unorm); TIC_FORMAT_CASE_ST_SRGB(Astc4x4, Astc4x4, Unorm); + TIC_FORMAT_CASE_ST(Astc5x5, Astc5x5, Unorm); + TIC_FORMAT_CASE_ST_SRGB(Astc5x5, Astc5x5, Unorm); TIC_FORMAT_CASE_ST(Astc6x6, Astc6x6, Unorm); TIC_FORMAT_CASE_ST_SRGB(Astc6x6, Astc6x6, Unorm); TIC_FORMAT_CASE_ST(Astc8x8, Astc8x8, Unorm); TIC_FORMAT_CASE_ST_SRGB(Astc8x8, Astc8x8, Unorm); + TIC_FORMAT_CASE_ST(Astc10x10, Astc10x10, Unorm); + TIC_FORMAT_CASE_ST_SRGB(Astc10x10, Astc10x10, Unorm); TIC_FORMAT_CASE_ST(BC2, BC2, Unorm); TIC_FORMAT_CASE_ST_SRGB(BC2, BC2, Unorm); TIC_FORMAT_CASE_ST(BC3, BC3, Unorm); diff --git a/app/src/main/cpp/skyline/gpu/texture/format.h b/app/src/main/cpp/skyline/gpu/texture/format.h index cd922724..46a451c2 100644 --- a/app/src/main/cpp/skyline/gpu/texture/format.h +++ b/app/src/main/cpp/skyline/gpu/texture/format.h @@ -136,6 +136,10 @@ namespace skyline::gpu::format { .blockWidth = 4, .blockHeight = 4 ); + FORMAT_SUFF_UNORM_SRGB(Astc5x5, 128, eAstc5x5, Block, + .blockWidth = 5, + .blockHeight = 5 + ); FORMAT_SUFF_UNORM_SRGB(Astc6x6, 128, eAstc6x6, Block, .blockWidth = 6, .blockHeight = 6 @@ -144,6 +148,10 @@ namespace skyline::gpu::format { .blockWidth = 8, .blockHeight = 8 ); + FORMAT_SUFF_UNORM_SRGB(Astc10x10, 128, eAstc10x10, Block, + .blockWidth = 10, + .blockHeight = 10 + ); // Depth/Stencil Formats // All of these have a G->R swizzle