From 026bb04386a85475dd553bcc56c52c049e1e8192 Mon Sep 17 00:00:00 2001 From: Billy Laws Date: Sun, 30 Oct 2022 19:33:46 +0000 Subject: [PATCH] Impl some more texture formats --- .../main/cpp/skyline/gpu/interconnect/maxwell_3d/textures.cpp | 4 ++++ app/src/main/cpp/skyline/gpu/texture/format.h | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/app/src/main/cpp/skyline/gpu/interconnect/maxwell_3d/textures.cpp b/app/src/main/cpp/skyline/gpu/interconnect/maxwell_3d/textures.cpp index fec6ed0f..5ce4f95a 100644 --- a/app/src/main/cpp/skyline/gpu/interconnect/maxwell_3d/textures.cpp +++ b/app/src/main/cpp/skyline/gpu/interconnect/maxwell_3d/textures.cpp @@ -111,6 +111,8 @@ namespace skyline::gpu::interconnect::maxwell3d { TIC_FORMAT_CASE_INT_FLOAT(R32G32, R32G32); TIC_FORMAT_CASE(D32S8, D32FloatS8Uint, Float, Uint, Uint, Unorm); TIC_FORMAT_CASE(D32S8, D32FloatS8Uint, Float, Uint, Unorm, Unorm); + TIC_FORMAT_CASE(R32B24G8, D32FloatS8Uint, Float, Uint, Unorm, Unorm); + TIC_FORMAT_CASE_NORM_INT_FLOAT(R16G16B16A16, R16G16B16A16); TIC_FORMAT_CASE_ST(Astc4x4, Astc4x4, Unorm); @@ -121,6 +123,8 @@ namespace skyline::gpu::interconnect::maxwell3d { 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(Astc10x8, Astc10x8, Unorm); + 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(BC2, BC2, Unorm); diff --git a/app/src/main/cpp/skyline/gpu/texture/format.h b/app/src/main/cpp/skyline/gpu/texture/format.h index 618691d1..e37a9601 100644 --- a/app/src/main/cpp/skyline/gpu/texture/format.h +++ b/app/src/main/cpp/skyline/gpu/texture/format.h @@ -150,6 +150,10 @@ namespace skyline::gpu::format { .blockWidth = 8, .blockHeight = 8 ); + FORMAT_SUFF_UNORM_SRGB(Astc10x8, 128, eAstc10x8, Block, + .blockWidth = 10, + .blockHeight = 8 + ); FORMAT_SUFF_UNORM_SRGB(Astc10x10, 128, eAstc10x10, Block, .blockWidth = 10, .blockHeight = 10