fix super mario galaxy 0x25E00040 error (ryubing/ryujinx!155)

See merge request ryubing/ryujinx!155

src/Ryujinx.Graphics.GAL/Format.cs

@@ -149,6 +149,7 @@ namespace Ryujinx.Graphics.GAL
         B8G8R8A8Srgb,
         B10G10R10A2Unorm,
         X8UintD24Unorm,
+        A8B8G8R8Uint,
     }
 
     public static class FormatExtensions

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<TextureFormat, FormatInfo> _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
 

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;

src/Ryujinx/UI/Helpers/Converters/GlyphValueConverter.cs

@@ -14,6 +14,8 @@ namespace Ryujinx.Ava.UI.Helpers
             { Glyph.List, char.ConvertFromUtf32((int)Symbol.List) },
             { Glyph.Grid, char.ConvertFromUtf32((int)Symbol.ViewAll) },
             { Glyph.Chip, char.ConvertFromUtf32(59748) },
+            { Glyph.Device, char.ConvertFromUtf32(0xE7F7) },
+            { Glyph.Bug, char.ConvertFromUtf32(0xEBE8) },
             { Glyph.Important, char.ConvertFromUtf32((int)Symbol.Important) },
         };
 

src/Ryujinx/UI/Helpers/Glyph.cs

@@ -5,6 +5,8 @@ namespace Ryujinx.Ava.UI.Helpers
         List,
         Grid,
         Chip,
+        Device,
+        Bug,
         Important,
     }
 }

src/Ryujinx/UI/Views/Settings/SettingsUIView.axaml

@@ -27,13 +27,6 @@
                     Spacing="10">
                     <TextBlock Classes="h1" Text="{ext:Locale SettingsTabGeneralGeneral}" />
                     <StackPanel Margin="10,0,0,0" Orientation="Vertical">
-                        <CheckBox IsChecked="{Binding EnableDiscordIntegration}">
-                            <StackPanel Orientation="Horizontal">
-                                <TextBlock VerticalAlignment="Center"
-                                           ToolTip.Tip="{ext:Locale ToggleDiscordTooltip}"
-                                           Text="{ext:Locale SettingsTabGeneralEnableDiscordRichPresence}" />
-                            </StackPanel>
-                        </CheckBox>
                         <CheckBox
                             IsEnabled="{Binding !IsGameTitleNotNull}"
                             Opacity="{Binding PanelOpacity}"
@@ -62,6 +55,13 @@
                                 <TextBlock Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}" />
                             </StackPanel>
                         </CheckBox>
+                        <CheckBox IsChecked="{Binding EnableDiscordIntegration}">
+                            <StackPanel Orientation="Horizontal">
+                                <TextBlock VerticalAlignment="Center"
+                                           ToolTip.Tip="{ext:Locale ToggleDiscordTooltip}"
+                                           Text="{ext:Locale SettingsTabGeneralEnableDiscordRichPresence}" />
+                            </StackPanel>
+                        </CheckBox>
                         <StackPanel
                             Margin="0, 15, 0, 0"
                             Orientation="Horizontal">
@@ -101,7 +101,7 @@
                                       HorizontalContentAlignment="Left"
                                       MinWidth="100">
                                 <ComboBoxItem>
-                                    <TextBlock Text="{ext:Locale SettingsTabGeneralCheckUpdatesOnLaunchOff}" />
+                                    <TextBlock Text="{ext:Locale CommonOff}" />
                                 </ComboBoxItem>
                                 <ComboBoxItem>
                                     <TextBlock
@@ -123,7 +123,7 @@
                                       HorizontalContentAlignment="Left"
                                       MinWidth="100">
                                 <ComboBoxItem>
-                                    <TextBlock Text="{ext:Locale SettingsTabGeneralHideCursorNever}" />
+                                    <TextBlock Text="{ext:Locale Never}" />
                                 </ComboBoxItem>
                                 <ComboBoxItem>
                                     <TextBlock Text="{ext:Locale SettingsTabGeneralHideCursorOnIdle}" />
@@ -146,7 +146,7 @@
                                       HorizontalContentAlignment="Left"
                                       MinWidth="100">
                                 <ComboBoxItem>
-                                    <TextBlock Text="{ext:Locale SettingsTabGeneralThemeAuto}" />
+                                    <TextBlock Text="{ext:Locale CommonAuto}" />
                                 </ComboBoxItem>
                                 <ComboBoxItem>
                                     <TextBlock Text="{ext:Locale SettingsTabGeneralThemeLight}" />
@@ -198,14 +198,13 @@
                             <TextBox
                                 Name="GameDirPathBox"
                                 Margin="0"
-                                ToolTip.Tip="{ext:Locale AddGameDirBoxTooltip}"
+                                Watermark="{ext:Locale AddGameDirBoxTooltip}"
                                 VerticalAlignment="Stretch" />
                             <Button
                                 Name="AddGameDirButton"
                                 Grid.Column="1"
                                 MinWidth="90"
-                                Margin="10,0,0,0"
-                                ToolTip.Tip="{ext:Locale AddGameDirTooltip}">
+                                Margin="10,0,0,0">
                                 <TextBlock HorizontalAlignment="Center"
                                            Text="{ext:Locale SettingsTabGeneralAdd}" />
                             </Button>
@@ -213,8 +212,7 @@
                                 Name="RemoveGameDirButton"
                                 Grid.Column="2"
                                 MinWidth="90"
-                                Margin="10,0,0,0"
-                                ToolTip.Tip="{ext:Locale RemoveGameDirTooltip}"
+                                Margin="5,0,0,0"
                                 Click="RemoveGameDirButton_OnClick">
                                 <TextBlock HorizontalAlignment="Center"
                                            Text="{ext:Locale SettingsTabGeneralRemove}" />
@@ -252,14 +250,13 @@
                             <TextBox
                                 Name="AutoloadDirPathBox"
                                 Margin="0"
-                                ToolTip.Tip="{ext:Locale AddAutoloadDirBoxTooltip}"
+                                Watermark="{ext:Locale AddGameDirBoxTooltip}"
                                 VerticalAlignment="Stretch" />
                             <Button
                                 Name="AddAutoloadDirButton"
                                 Grid.Column="1"
                                 MinWidth="90"
-                                Margin="10,0,0,0"
-                                ToolTip.Tip="{ext:Locale AddAutoloadDirTooltip}">
+                                Margin="10,0,0,0">
                                 <TextBlock HorizontalAlignment="Center"
                                            Text="{ext:Locale SettingsTabGeneralAdd}" />
                             </Button>
@@ -267,8 +264,7 @@
                                 Name="RemoveAutoloadDirButton"
                                 Grid.Column="2"
                                 MinWidth="90"
-                                Margin="10,0,0,0"
-                                ToolTip.Tip="{ext:Locale RemoveAutoloadDirTooltip}"
+                                Margin="5,0,0,0"
                                 Click="RemoveAutoloadDirButton_OnClick">
                                 <TextBlock HorizontalAlignment="Center"
                                            Text="{ext:Locale SettingsTabGeneralRemove}" />

src/Ryujinx/UI/Windows/SettingsWindow.axaml

@@ -39,11 +39,11 @@
         <Grid Name="Pages" IsVisible="False" Grid.Row="3">
             <settings:SettingsUiView Name="UiPage" />
             <settings:SettingsInputView Name="InputPage" />
-            <settings:SettingsHotkeysView Name="HotkeysPage" />
             <settings:SettingsSystemView Name="SystemPage" />
             <settings:SettingsCPUView Name="CpuPage" />
             <settings:SettingsGraphicsView Name="GraphicsPage" />
             <settings:SettingsAudioView Name="AudioPage" />
+            <settings:SettingsHotkeysView Name="HotkeysPage" />
             <settings:SettingsNetworkView Name="NetworkPage" />
             <settings:SettingsLoggingView Name="LoggingPage" />
             <settings:SettingsDebugView Name="DebugPage" />
@@ -54,7 +54,7 @@
             IsSettingsVisible="False"
             Name="NavPanel"
             IsBackEnabled="False"
-            Margin="10,10,10,0"
+            Margin="10,0,10,0"
             VerticalAlignment="Stretch"
             HorizontalAlignment="Stretch"
             OpenPaneLength="200">
@@ -62,16 +62,17 @@
                 <ui:NavigationViewItem
                     IsSelected="True"
                     Content="{ext:Locale SettingsTabGeneral}"
-                    Tag="UiPage"
-                    IconSource="New" />
+                    Tag="UiPage">
+                    <ui:NavigationViewItem.IconSource>
+                        <ui:FontIconSource
+                            FontFamily="avares://Ryujinx/Assets/Fonts#Segoe Fluent Icons"
+                            Glyph="{helpers:GlyphValueConverter Device}" />
+                    </ui:NavigationViewItem.IconSource>
+                </ui:NavigationViewItem>
                 <ui:NavigationViewItem
                     Content="{ext:Locale SettingsTabInput}"
                     Tag="InputPage"
                     IconSource="Games" />
-                <ui:NavigationViewItem
-                    Content="{ext:Locale SettingsTabHotkeys}"
-                    Tag="HotkeysPage"
-                    IconSource="Keyboard" />
                 <ui:NavigationViewItem
                     Content="{ext:Locale SettingsTabSystem}"
                     Tag="SystemPage"
@@ -93,6 +94,10 @@
                     Content="{ext:Locale SettingsTabAudio}"
                     IconSource="Audio"
                     Tag="AudioPage" />
+                <ui:NavigationViewItem
+                    Content="{ext:Locale SettingsTabHotkeys}"
+                    Tag="HotkeysPage"
+                    IconSource="Keyboard" />
                 <ui:NavigationViewItem
                     Content="{ext:Locale SettingsTabNetwork}"
                     Tag="NetworkPage"
@@ -103,8 +108,13 @@
                     IconSource="Document" />
                 <ui:NavigationViewItem
                     Content="{ext:Locale SettingsTabDebug}"
-                    Tag="DebugPage"
-                    IconSource="Star" />
+                    Tag="DebugPage">
+                    <ui:NavigationViewItem.IconSource>
+                        <ui:FontIconSource
+                            FontFamily="avares://Ryujinx/Assets/Fonts#Segoe Fluent Icons"
+                            Glyph="{helpers:GlyphValueConverter Bug}" />
+                    </ui:NavigationViewItem.IconSource>
+                </ui:NavigationViewItem>
                 <ui:NavigationViewItem
                     IsVisible="{Binding ShowDirtyHacks}"
                     Content="Dirty Hacks"