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 ec2737cf..93fb5d96 100644 --- a/app/src/main/cpp/skyline/gpu/interconnect/graphics_context.h +++ b/app/src/main/cpp/skyline/gpu/interconnect/graphics_context.h @@ -114,8 +114,14 @@ namespace skyline::gpu::interconnect { return format::A8B8G8R8Srgb; case maxwell3d::RenderTarget::ColorFormat::A8B8G8R8Snorm: return format::A8B8G8R8Snorm; + case maxwell3d::RenderTarget::ColorFormat::R16G16Unorm: + return format::R16G16Unorm; case maxwell3d::RenderTarget::ColorFormat::R16G16Snorm: return format::R16G16Snorm; + case maxwell3d::RenderTarget::ColorFormat::R16G16Sint: + return format::R16G16Sint; + case maxwell3d::RenderTarget::ColorFormat::R16G16Uint: + return format::R16G16Uint; case maxwell3d::RenderTarget::ColorFormat::R16G16Float: return format::R16G16Float; case maxwell3d::RenderTarget::ColorFormat::B10G11R11Float: diff --git a/app/src/main/cpp/skyline/gpu/texture/format.h b/app/src/main/cpp/skyline/gpu/texture/format.h index f44f2878..511cba1d 100644 --- a/app/src/main/cpp/skyline/gpu/texture/format.h +++ b/app/src/main/cpp/skyline/gpu/texture/format.h @@ -16,7 +16,10 @@ namespace skyline::gpu::format { constexpr Format A2B10G10R10Unorm{sizeof(u32), vkf::eA2B10G10R10UnormPack32}; constexpr Format A8B8G8R8Srgb{sizeof(u32), vkf::eA8B8G8R8SrgbPack32}; constexpr Format A8B8G8R8Snorm{sizeof(u32), vkf::eA8B8G8R8SnormPack32}; + constexpr Format R16G16Unorm{sizeof(u32), vkf::eR16G16Unorm}; constexpr Format R16G16Snorm{sizeof(u32), vkf::eR16G16Snorm}; + constexpr Format R16G16Sint{sizeof(u32), vkf::eR16G16Sint}; + constexpr Format R16G16Uint{sizeof(u32), vkf::eR16G16Uint}; constexpr Format R16G16Float{sizeof(u32), vkf::eR16G16Sfloat}; constexpr Format B10G11R11Float{sizeof(u32), vkf::eB10G11R11UfloatPack32}; constexpr Format R32Float{sizeof(u32), vkf::eR32Sfloat}; @@ -53,8 +56,14 @@ namespace skyline::gpu::format { return A8B8G8R8Srgb; case vk::Format::eA8B8G8R8SnormPack32: return A8B8G8R8Snorm; + case vk::Format::eR16G16Unorm: + return R16G16Unorm; case vk::Format::eR16G16Snorm: return R16G16Snorm; + case vk::Format::eR16G16Sint: + return R16G16Sint; + case vk::Format::eR16G16Uint: + return R16G16Uint; case vk::Format::eR16G16Sfloat: return R16G16Float; case vk::Format::eB10G11R11UfloatPack32: diff --git a/app/src/main/cpp/skyline/soc/gm20b/engines/maxwell/types.h b/app/src/main/cpp/skyline/soc/gm20b/engines/maxwell/types.h index a848a224..f7f93299 100644 --- a/app/src/main/cpp/skyline/soc/gm20b/engines/maxwell/types.h +++ b/app/src/main/cpp/skyline/soc/gm20b/engines/maxwell/types.h @@ -52,7 +52,10 @@ namespace skyline::soc::gm20b::engine::maxwell3d::type { R8G8B8A8Unorm = 0xD5, A8B8G8R8Srgb = 0xD6, A8B8G8R8Snorm = 0xD7, + R16G16Unorm = 0xDA, R16G16Snorm = 0xDB, + R16G16Sint = 0xDC, + R16G16Uint = 0xDD, R16G16Float = 0xDE, B10G11R11Float = 0xE0, R32Float = 0xE5,