From 4444ecae415fa66087bf22dad2a6f71d491e8b8f Mon Sep 17 00:00:00 2001 From: Astell Date: Fri, 10 Oct 2025 17:37:42 -0500 Subject: [PATCH] fix super mario galaxy 0x25E00040 error (ryubing/ryujinx!155) See merge request ryubing/ryujinx!155 --- src/Ryujinx.Graphics.GAL/Format.cs | 1 + src/Ryujinx.Graphics.Gpu/Image/FormatTable.cs | 2 ++ src/Ryujinx.Graphics.Vulkan/FormatCapabilities.cs | 3 +++ 3 files changed, 6 insertions(+) diff --git a/src/Ryujinx.Graphics.GAL/Format.cs b/src/Ryujinx.Graphics.GAL/Format.cs index 17c42d2d4..25446f978 100644 --- a/src/Ryujinx.Graphics.GAL/Format.cs +++ b/src/Ryujinx.Graphics.GAL/Format.cs @@ -149,6 +149,7 @@ namespace Ryujinx.Graphics.GAL B8G8R8A8Srgb, B10G10R10A2Unorm, X8UintD24Unorm, + A8B8G8R8Uint, } public static class FormatExtensions diff --git a/src/Ryujinx.Graphics.Gpu/Image/FormatTable.cs b/src/Ryujinx.Graphics.Gpu/Image/FormatTable.cs index ee217714c..8d8b00719 100644 --- a/src/Ryujinx.Graphics.Gpu/Image/FormatTable.cs +++ b/src/Ryujinx.Graphics.Gpu/Image/FormatTable.cs @@ -359,6 +359,7 @@ namespace Ryujinx.Graphics.Gpu.Image A2B10G10R10Sint = (A2B10G10R10 << 21) | (Sint << 27), // 0x1e000000 A2B10G10R10Uscaled = (A2B10G10R10 << 21) | (Uscaled << 27), // 0x2e000000 A2B10G10R10Sscaled = (A2B10G10R10 << 21) | (Sscaled << 27), // 0x36000000 + A8B8G8R8Uint = (A8B8G8R8 << 21) | (Uint << 27), // 0x25E00040 } private static readonly Dictionary _textureFormats = new() @@ -554,6 +555,7 @@ namespace Ryujinx.Graphics.Gpu.Image { VertexAttributeFormat.A2B10G10R10Sint, Format.R10G10B10A2Sint }, { VertexAttributeFormat.A2B10G10R10Uscaled, Format.R10G10B10A2Uscaled }, { VertexAttributeFormat.A2B10G10R10Sscaled, Format.R10G10B10A2Sscaled }, + { VertexAttributeFormat.A8B8G8R8Uint, Format.A8B8G8R8Uint }, }; #pragma warning restore IDE0055 diff --git a/src/Ryujinx.Graphics.Vulkan/FormatCapabilities.cs b/src/Ryujinx.Graphics.Vulkan/FormatCapabilities.cs index 0657638c9..aee55fef4 100644 --- a/src/Ryujinx.Graphics.Vulkan/FormatCapabilities.cs +++ b/src/Ryujinx.Graphics.Vulkan/FormatCapabilities.cs @@ -211,6 +211,9 @@ namespace Ryujinx.Graphics.Vulkan case Format.R16G16B16Uint: format = VkFormat.R16G16B16A16Uint; break; + case Format.A8B8G8R8Uint: + format = VkFormat.A8B8G8R8UintPack32; + break; default: Logger.Error?.Print(LogClass.Gpu, $"Format {srcFormat} is not supported by the host."); break;