Compare commits
28 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
1b28ecd63e | ||
|
895d9b53bc | ||
|
0e06aace45 | ||
|
adf4ebcd60 | ||
|
470a8031a4 | ||
|
5440d4ad5c | ||
|
dde208b480 | ||
|
4c3d2d5d75 | ||
|
fab11ba3f1 | ||
|
332891b5ff | ||
|
7df4fcada7 | ||
|
d6698680be | ||
|
e5c9838b0b | ||
|
f8ec878796 | ||
|
9ff21f9ab6 | ||
|
aa021085cf | ||
|
1f5d881860 | ||
|
1f664100bd | ||
|
1f5e1ffa80 | ||
|
264438ff19 | ||
|
3b8ac1641a | ||
|
4250732353 | ||
|
4d1579acbf | ||
|
6279f5e430 | ||
|
b7d2bff6aa | ||
|
7c327fecb3 | ||
|
cc1a933a2f | ||
|
dd574146fb |
@@ -1,6 +1,6 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
SCRIPT_DIR=$(dirname $(realpath $0))
|
SCRIPT_DIR=$(dirname "$(realpath "$0")")
|
||||||
RYUJINX_BIN="Ryujinx"
|
RYUJINX_BIN="Ryujinx"
|
||||||
|
|
||||||
if [ -f "$SCRIPT_DIR/Ryujinx.Ava" ]; then
|
if [ -f "$SCRIPT_DIR/Ryujinx.Ava" ]; then
|
||||||
|
@@ -157,7 +157,7 @@ namespace Ryujinx.Ava
|
|||||||
_isFirmwareTitle = true;
|
_isFirmwareTitle = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
ConfigurationState.Instance.HideCursorOnIdle.Event += HideCursorState_Changed;
|
ConfigurationState.Instance.HideCursor.Event += HideCursorState_Changed;
|
||||||
|
|
||||||
_topLevel.PointerMoved += TopLevel_PointerMoved;
|
_topLevel.PointerMoved += TopLevel_PointerMoved;
|
||||||
|
|
||||||
@@ -468,9 +468,9 @@ namespace Ryujinx.Ava
|
|||||||
(_rendererHost.EmbeddedWindow as EmbeddedWindowOpenGL)?.MakeCurrent(null);
|
(_rendererHost.EmbeddedWindow as EmbeddedWindowOpenGL)?.MakeCurrent(null);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void HideCursorState_Changed(object sender, ReactiveEventArgs<bool> state)
|
private void HideCursorState_Changed(object sender, ReactiveEventArgs<HideCursorMode> state)
|
||||||
{
|
{
|
||||||
if (state.NewValue)
|
if (state.NewValue == HideCursorMode.OnIdle)
|
||||||
{
|
{
|
||||||
_lastCursorMoveTime = Stopwatch.GetTimestamp();
|
_lastCursorMoveTime = Stopwatch.GetTimestamp();
|
||||||
}
|
}
|
||||||
@@ -964,22 +964,21 @@ namespace Ryujinx.Ava
|
|||||||
NpadManager.Update(ConfigurationState.Instance.Graphics.AspectRatio.Value.ToFloat());
|
NpadManager.Update(ConfigurationState.Instance.Graphics.AspectRatio.Value.ToFloat());
|
||||||
|
|
||||||
if (_viewModel.IsActive)
|
if (_viewModel.IsActive)
|
||||||
{
|
|
||||||
if (ConfigurationState.Instance.Hid.EnableMouse)
|
|
||||||
{
|
{
|
||||||
if (_isCursorInRenderer)
|
if (_isCursorInRenderer)
|
||||||
|
{
|
||||||
|
if (ConfigurationState.Instance.Hid.EnableMouse)
|
||||||
{
|
{
|
||||||
HideCursor();
|
HideCursor();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
switch (ConfigurationState.Instance.HideCursor.Value)
|
||||||
|
{
|
||||||
|
case HideCursorMode.Never:
|
||||||
ShowCursor();
|
ShowCursor();
|
||||||
}
|
break;
|
||||||
}
|
case HideCursorMode.OnIdle:
|
||||||
else
|
|
||||||
{
|
|
||||||
if (ConfigurationState.Instance.HideCursorOnIdle)
|
|
||||||
{
|
|
||||||
if (Stopwatch.GetTimestamp() - _lastCursorMoveTime >= CursorHideIdleTime * Stopwatch.Frequency)
|
if (Stopwatch.GetTimestamp() - _lastCursorMoveTime >= CursorHideIdleTime * Stopwatch.Frequency)
|
||||||
{
|
{
|
||||||
HideCursor();
|
HideCursor();
|
||||||
@@ -988,8 +987,17 @@ namespace Ryujinx.Ava
|
|||||||
{
|
{
|
||||||
ShowCursor();
|
ShowCursor();
|
||||||
}
|
}
|
||||||
|
break;
|
||||||
|
case HideCursorMode.Always:
|
||||||
|
HideCursor();
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
ShowCursor();
|
||||||
|
}
|
||||||
|
|
||||||
Dispatcher.UIThread.Post(() =>
|
Dispatcher.UIThread.Post(() =>
|
||||||
{
|
{
|
||||||
|
@@ -80,7 +80,10 @@
|
|||||||
"SettingsTabGeneralEnableDiscordRichPresence": "Enable Discord Rich Presence",
|
"SettingsTabGeneralEnableDiscordRichPresence": "Enable Discord Rich Presence",
|
||||||
"SettingsTabGeneralCheckUpdatesOnLaunch": "Check for Updates on Launch",
|
"SettingsTabGeneralCheckUpdatesOnLaunch": "Check for Updates on Launch",
|
||||||
"SettingsTabGeneralShowConfirmExitDialog": "Show \"Confirm Exit\" Dialog",
|
"SettingsTabGeneralShowConfirmExitDialog": "Show \"Confirm Exit\" Dialog",
|
||||||
"SettingsTabGeneralHideCursorOnIdle": "Hide Cursor on Idle",
|
"SettingsTabGeneralHideCursor": "Hide Cursor:",
|
||||||
|
"SettingsTabGeneralHideCursorNever": "Never",
|
||||||
|
"SettingsTabGeneralHideCursorOnIdle": "On Idle",
|
||||||
|
"SettingsTabGeneralHideCursorAlways": "Always",
|
||||||
"SettingsTabGeneralGameDirectories": "Game Directories",
|
"SettingsTabGeneralGameDirectories": "Game Directories",
|
||||||
"SettingsTabGeneralAdd": "Add",
|
"SettingsTabGeneralAdd": "Add",
|
||||||
"SettingsTabGeneralRemove": "Remove",
|
"SettingsTabGeneralRemove": "Remove",
|
||||||
@@ -587,6 +590,7 @@
|
|||||||
"DlcWindowTitle": "Manage Downloadable Content for {0} ({1})",
|
"DlcWindowTitle": "Manage Downloadable Content for {0} ({1})",
|
||||||
"UpdateWindowTitle": "Title Update Manager",
|
"UpdateWindowTitle": "Title Update Manager",
|
||||||
"CheatWindowHeading": "Cheats Available for {0} [{1}]",
|
"CheatWindowHeading": "Cheats Available for {0} [{1}]",
|
||||||
|
"BuildId": "BuildId:",
|
||||||
"DlcWindowHeading": "{0} Downloadable Content(s)",
|
"DlcWindowHeading": "{0} Downloadable Content(s)",
|
||||||
"UserProfilesEditProfile": "Edit Selected",
|
"UserProfilesEditProfile": "Edit Selected",
|
||||||
"Cancel": "Cancel",
|
"Cancel": "Cancel",
|
||||||
@@ -641,5 +645,6 @@
|
|||||||
"UserEditorTitleCreate" : "Create User",
|
"UserEditorTitleCreate" : "Create User",
|
||||||
"SettingsTabNetworkInterface": "Network Interface:",
|
"SettingsTabNetworkInterface": "Network Interface:",
|
||||||
"NetworkInterfaceTooltip": "The network interface used for LAN features",
|
"NetworkInterfaceTooltip": "The network interface used for LAN features",
|
||||||
"NetworkInterfaceDefault": "Default"
|
"NetworkInterfaceDefault": "Default",
|
||||||
|
"PackagingShaders": "Packaging Shaders"
|
||||||
}
|
}
|
||||||
|
@@ -233,8 +233,13 @@ namespace Ryujinx.Ava.Common
|
|||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
IFileSystem ncaFileSystem = patchNca != null
|
bool sectionExistsInPatch = false;
|
||||||
? mainNca.OpenFileSystemWithPatch(patchNca, index, IntegrityCheckLevel.ErrorOnInvalid)
|
if (patchNca != null)
|
||||||
|
{
|
||||||
|
sectionExistsInPatch = patchNca.CanOpenSection(index);
|
||||||
|
}
|
||||||
|
|
||||||
|
IFileSystem ncaFileSystem = sectionExistsInPatch ? mainNca.OpenFileSystemWithPatch(patchNca, index, IntegrityCheckLevel.ErrorOnInvalid)
|
||||||
: mainNca.OpenFileSystem(index, IntegrityCheckLevel.ErrorOnInvalid);
|
: mainNca.OpenFileSystem(index, IntegrityCheckLevel.ErrorOnInvalid);
|
||||||
|
|
||||||
FileSystemClient fsClient = _horizonClient.Fs;
|
FileSystemClient fsClient = _horizonClient.Fs;
|
||||||
|
@@ -183,6 +183,18 @@ namespace Ryujinx.Ava
|
|||||||
{
|
{
|
||||||
ConfigurationState.Instance.System.EnableDockedMode.Value = CommandLineState.OverrideDockedMode.Value;
|
ConfigurationState.Instance.System.EnableDockedMode.Value = CommandLineState.OverrideDockedMode.Value;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Check if HideCursor was overridden.
|
||||||
|
if (CommandLineState.OverrideHideCursor is not null)
|
||||||
|
{
|
||||||
|
ConfigurationState.Instance.HideCursor.Value = CommandLineState.OverrideHideCursor!.ToLower() switch
|
||||||
|
{
|
||||||
|
"never" => HideCursorMode.Never,
|
||||||
|
"onidle" => HideCursorMode.OnIdle,
|
||||||
|
"always" => HideCursorMode.Always,
|
||||||
|
_ => ConfigurationState.Instance.HideCursor.Value
|
||||||
|
};
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void PrintSystemInfo()
|
private static void PrintSystemInfo()
|
||||||
|
@@ -103,50 +103,6 @@
|
|||||||
<Generator>MSBuild:Compile</Generator>
|
<Generator>MSBuild:Compile</Generator>
|
||||||
</AvaloniaResource>
|
</AvaloniaResource>
|
||||||
<AvaloniaResource Include="Assets\Styles\Styles.xaml" />
|
<AvaloniaResource Include="Assets\Styles\Styles.xaml" />
|
||||||
|
|
||||||
<Compile Update="App.axaml.cs">
|
|
||||||
<DependentUpon>App.axaml</DependentUpon>
|
|
||||||
<SubType>Code</SubType>
|
|
||||||
</Compile>
|
|
||||||
<Compile Update="Ui\Windows\MainWindow.axaml.cs">
|
|
||||||
<DependentUpon>MainWindow.axaml</DependentUpon>
|
|
||||||
<SubType>Code</SubType>
|
|
||||||
</Compile>
|
|
||||||
<Compile Update="Ui\Windows\AboutWindow.axaml.cs">
|
|
||||||
<DependentUpon>AboutWindow.axaml</DependentUpon>
|
|
||||||
<SubType>Code</SubType>
|
|
||||||
</Compile>
|
|
||||||
<Compile Update="Ui\Applet\ErrorAppletWindow.axaml.cs">
|
|
||||||
<DependentUpon>ProfileWindow.axaml</DependentUpon>
|
|
||||||
<SubType>Code</SubType>
|
|
||||||
</Compile>
|
|
||||||
<Compile Update="Ui\Applet\SwkbdAppletWindow.axaml.cs">
|
|
||||||
<DependentUpon>ProfileWindow.axaml</DependentUpon>
|
|
||||||
<SubType>Code</SubType>
|
|
||||||
</Compile>
|
|
||||||
<Compile Update="Ui\Controls\InputDialog.axaml.cs">
|
|
||||||
<DependentUpon>InputDialog.axaml</DependentUpon>
|
|
||||||
<SubType>Code</SubType>
|
|
||||||
</Compile>
|
|
||||||
<Compile Update="Ui\Windows\ContentDialogOverlay.xaml.cs">
|
|
||||||
<DependentUpon>ContentDialogOverlay.xaml</DependentUpon>
|
|
||||||
</Compile>
|
|
||||||
<Compile Update="Ui\Controls\GameListView.axaml.cs">
|
|
||||||
<DependentUpon>GameListView.axaml</DependentUpon>
|
|
||||||
<SubType>Code</SubType>
|
|
||||||
</Compile>
|
|
||||||
<Compile Update="UI\Views\User\UserEditorView.axaml.cs">
|
|
||||||
<DependentUpon>UserEditor.axaml</DependentUpon>
|
|
||||||
<SubType>Code</SubType>
|
|
||||||
</Compile>
|
|
||||||
<Compile Update="UI\Views\User\UserRecovererView.axaml.cs">
|
|
||||||
<DependentUpon>UserRecoverer.axaml</DependentUpon>
|
|
||||||
<SubType>Code</SubType>
|
|
||||||
</Compile>
|
|
||||||
<Compile Update="UI\Views\User\UserSelectorView.axaml.cs">
|
|
||||||
<DependentUpon>UserSelector.axaml</DependentUpon>
|
|
||||||
<SubType>Code</SubType>
|
|
||||||
</Compile>
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
80
src/Ryujinx.Ava/UI/Controls/ApplicationContextMenu.axaml
Normal file
80
src/Ryujinx.Ava/UI/Controls/ApplicationContextMenu.axaml
Normal file
@@ -0,0 +1,80 @@
|
|||||||
|
<MenuFlyout
|
||||||
|
x:Class="Ryujinx.Ava.UI.Controls.ApplicationContextMenu"
|
||||||
|
xmlns="https://github.com/avaloniaui"
|
||||||
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
|
xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale">
|
||||||
|
<MenuItem
|
||||||
|
Click="ToggleFavorite_Click"
|
||||||
|
Header="{locale:Locale GameListContextMenuToggleFavorite}"
|
||||||
|
ToolTip.Tip="{locale:Locale GameListContextMenuToggleFavoriteToolTip}" />
|
||||||
|
<Separator />
|
||||||
|
<MenuItem
|
||||||
|
Click="OpenUserSaveDirectory_Click"
|
||||||
|
Header="{locale:Locale GameListContextMenuOpenUserSaveDirectory}"
|
||||||
|
IsEnabled="{Binding OpenUserSaveDirectoryEnabled}"
|
||||||
|
ToolTip.Tip="{locale:Locale GameListContextMenuOpenUserSaveDirectoryToolTip}" />
|
||||||
|
<MenuItem
|
||||||
|
Click="OpenDeviceSaveDirectory_Click"
|
||||||
|
Header="{locale:Locale GameListContextMenuOpenDeviceSaveDirectory}"
|
||||||
|
IsEnabled="{Binding OpenDeviceSaveDirectoryEnabled}"
|
||||||
|
ToolTip.Tip="{locale:Locale GameListContextMenuOpenDeviceSaveDirectoryToolTip}" />
|
||||||
|
<MenuItem
|
||||||
|
Click="OpenBcatSaveDirectory_Click"
|
||||||
|
Header="{locale:Locale GameListContextMenuOpenBcatSaveDirectory}"
|
||||||
|
IsEnabled="{Binding OpenBcatSaveDirectoryEnabled}"
|
||||||
|
ToolTip.Tip="{locale:Locale GameListContextMenuOpenBcatSaveDirectoryToolTip}" />
|
||||||
|
<Separator />
|
||||||
|
<MenuItem
|
||||||
|
Click="OpenTitleUpdateManager_Click"
|
||||||
|
Header="{locale:Locale GameListContextMenuManageTitleUpdates}"
|
||||||
|
ToolTip.Tip="{locale:Locale GameListContextMenuManageTitleUpdatesToolTip}" />
|
||||||
|
<MenuItem
|
||||||
|
Click="OpenDownloadableContentManager_Click"
|
||||||
|
Header="{locale:Locale GameListContextMenuManageDlc}"
|
||||||
|
ToolTip.Tip="{locale:Locale GameListContextMenuManageDlcToolTip}" />
|
||||||
|
<MenuItem
|
||||||
|
Click="OpenCheatManager_Click"
|
||||||
|
Header="{locale:Locale GameListContextMenuManageCheat}"
|
||||||
|
ToolTip.Tip="{locale:Locale GameListContextMenuManageCheatToolTip}" />
|
||||||
|
<MenuItem
|
||||||
|
Click="OpenModsDirectory_Click"
|
||||||
|
Header="{locale:Locale GameListContextMenuOpenModsDirectory}"
|
||||||
|
ToolTip.Tip="{locale:Locale GameListContextMenuOpenModsDirectoryToolTip}" />
|
||||||
|
<MenuItem
|
||||||
|
Click="OpenSdModsDirectory_Click"
|
||||||
|
Header="{locale:Locale GameListContextMenuOpenSdModsDirectory}"
|
||||||
|
ToolTip.Tip="{locale:Locale GameListContextMenuOpenSdModsDirectoryToolTip}" />
|
||||||
|
<Separator />
|
||||||
|
<MenuItem Header="{locale:Locale GameListContextMenuCacheManagement}">
|
||||||
|
<MenuItem
|
||||||
|
Click="PurgePtcCache_Click"
|
||||||
|
Header="{locale:Locale GameListContextMenuCacheManagementPurgePptc}"
|
||||||
|
ToolTip.Tip="{locale:Locale GameListContextMenuCacheManagementPurgePptcToolTip}" />
|
||||||
|
<MenuItem
|
||||||
|
Click="PurgeShaderCache_Click"
|
||||||
|
Header="{locale:Locale GameListContextMenuCacheManagementPurgeShaderCache}"
|
||||||
|
ToolTip.Tip="{locale:Locale GameListContextMenuCacheManagementPurgeShaderCacheToolTip}" />
|
||||||
|
<MenuItem
|
||||||
|
Click="OpenPtcDirectory_Click"
|
||||||
|
Header="{locale:Locale GameListContextMenuCacheManagementOpenPptcDirectory}"
|
||||||
|
ToolTip.Tip="{locale:Locale GameListContextMenuCacheManagementOpenPptcDirectoryToolTip}" />
|
||||||
|
<MenuItem
|
||||||
|
Click="OpenShaderCacheDirectory_Click"
|
||||||
|
Header="{locale:Locale GameListContextMenuCacheManagementOpenShaderCacheDirectory}"
|
||||||
|
ToolTip.Tip="{locale:Locale GameListContextMenuCacheManagementOpenShaderCacheDirectoryToolTip}" />
|
||||||
|
</MenuItem>
|
||||||
|
<MenuItem Header="{locale:Locale GameListContextMenuExtractData}">
|
||||||
|
<MenuItem
|
||||||
|
Click="ExtractApplicationExeFs_Click"
|
||||||
|
Header="{locale:Locale GameListContextMenuExtractDataExeFS}"
|
||||||
|
ToolTip.Tip="{locale:Locale GameListContextMenuExtractDataExeFSToolTip}" />
|
||||||
|
<MenuItem
|
||||||
|
Click="ExtractApplicationRomFs_Click"
|
||||||
|
Header="{locale:Locale GameListContextMenuExtractDataRomFS}"
|
||||||
|
ToolTip.Tip="{locale:Locale GameListContextMenuExtractDataRomFSToolTip}" />
|
||||||
|
<MenuItem
|
||||||
|
Click="ExtractApplicationLogo_Click"
|
||||||
|
Header="{locale:Locale GameListContextMenuExtractDataLogo}"
|
||||||
|
ToolTip.Tip="{locale:Locale GameListContextMenuExtractDataLogoToolTip}" />
|
||||||
|
</MenuItem>
|
||||||
|
</MenuFlyout>
|
327
src/Ryujinx.Ava/UI/Controls/ApplicationContextMenu.axaml.cs
Normal file
327
src/Ryujinx.Ava/UI/Controls/ApplicationContextMenu.axaml.cs
Normal file
@@ -0,0 +1,327 @@
|
|||||||
|
using Avalonia.Controls;
|
||||||
|
using Avalonia.Interactivity;
|
||||||
|
using Avalonia.Markup.Xaml;
|
||||||
|
using Avalonia.Threading;
|
||||||
|
using LibHac.Fs;
|
||||||
|
using LibHac.Tools.FsSystem.NcaUtils;
|
||||||
|
using Ryujinx.Ava.Common;
|
||||||
|
using Ryujinx.Ava.Common.Locale;
|
||||||
|
using Ryujinx.Ava.UI.Helpers;
|
||||||
|
using Ryujinx.Ava.UI.ViewModels;
|
||||||
|
using Ryujinx.Ava.UI.Windows;
|
||||||
|
using Ryujinx.Common.Configuration;
|
||||||
|
using Ryujinx.Ui.App.Common;
|
||||||
|
using Ryujinx.HLE.HOS;
|
||||||
|
using Ryujinx.Ui.Common.Helper;
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Globalization;
|
||||||
|
using System.IO;
|
||||||
|
using Path = System.IO.Path;
|
||||||
|
using UserId = LibHac.Fs.UserId;
|
||||||
|
|
||||||
|
namespace Ryujinx.Ava.UI.Controls
|
||||||
|
{
|
||||||
|
public class ApplicationContextMenu : MenuFlyout
|
||||||
|
{
|
||||||
|
public ApplicationContextMenu()
|
||||||
|
{
|
||||||
|
InitializeComponent();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void InitializeComponent()
|
||||||
|
{
|
||||||
|
AvaloniaXamlLoader.Load(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void ToggleFavorite_Click(object sender, RoutedEventArgs args)
|
||||||
|
{
|
||||||
|
var viewModel = (sender as MenuItem)?.DataContext as MainWindowViewModel;
|
||||||
|
|
||||||
|
if (viewModel?.SelectedApplication != null)
|
||||||
|
{
|
||||||
|
viewModel.SelectedApplication.Favorite = !viewModel.SelectedApplication.Favorite;
|
||||||
|
|
||||||
|
viewModel.ApplicationLibrary.LoadAndSaveMetaData(viewModel.SelectedApplication.TitleId, appMetadata =>
|
||||||
|
{
|
||||||
|
appMetadata.Favorite = viewModel.SelectedApplication.Favorite;
|
||||||
|
});
|
||||||
|
|
||||||
|
viewModel.RefreshView();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void OpenUserSaveDirectory_Click(object sender, RoutedEventArgs args)
|
||||||
|
{
|
||||||
|
if ((sender as MenuItem)?.DataContext is MainWindowViewModel viewModel)
|
||||||
|
{
|
||||||
|
OpenSaveDirectory(viewModel, SaveDataType.Account, userId: new UserId((ulong)viewModel.AccountManager.LastOpenedUser.UserId.High, (ulong)viewModel.AccountManager.LastOpenedUser.UserId.Low));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void OpenDeviceSaveDirectory_Click(object sender, RoutedEventArgs args)
|
||||||
|
{
|
||||||
|
var viewModel = (sender as MenuItem)?.DataContext as MainWindowViewModel;
|
||||||
|
|
||||||
|
OpenSaveDirectory(viewModel, SaveDataType.Device, userId: default);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void OpenBcatSaveDirectory_Click(object sender, RoutedEventArgs args)
|
||||||
|
{
|
||||||
|
var viewModel = (sender as MenuItem)?.DataContext as MainWindowViewModel;
|
||||||
|
|
||||||
|
OpenSaveDirectory(viewModel, SaveDataType.Bcat, userId: default);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void OpenSaveDirectory(MainWindowViewModel viewModel, SaveDataType saveDataType, UserId userId)
|
||||||
|
{
|
||||||
|
if (viewModel?.SelectedApplication != null)
|
||||||
|
{
|
||||||
|
if (!ulong.TryParse(viewModel.SelectedApplication.TitleId, NumberStyles.HexNumber, CultureInfo.InvariantCulture, out ulong titleIdNumber))
|
||||||
|
{
|
||||||
|
Dispatcher.UIThread.InvokeAsync(async () =>
|
||||||
|
{
|
||||||
|
await ContentDialogHelper.CreateErrorDialog(LocaleManager.Instance[LocaleKeys.DialogRyujinxErrorMessage], LocaleManager.Instance[LocaleKeys.DialogInvalidTitleIdErrorMessage]);
|
||||||
|
});
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
var saveDataFilter = SaveDataFilter.Make(titleIdNumber, saveDataType, userId, saveDataId: default, index: default);
|
||||||
|
|
||||||
|
ApplicationHelper.OpenSaveDir(in saveDataFilter, titleIdNumber, viewModel.SelectedApplication.ControlHolder, viewModel.SelectedApplication.TitleName);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public async void OpenTitleUpdateManager_Click(object sender, RoutedEventArgs args)
|
||||||
|
{
|
||||||
|
var viewModel = (sender as MenuItem)?.DataContext as MainWindowViewModel;
|
||||||
|
|
||||||
|
if (viewModel?.SelectedApplication != null)
|
||||||
|
{
|
||||||
|
await TitleUpdateWindow.Show(viewModel.VirtualFileSystem, ulong.Parse(viewModel.SelectedApplication.TitleId, NumberStyles.HexNumber), viewModel.SelectedApplication.TitleName);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public async void OpenDownloadableContentManager_Click(object sender, RoutedEventArgs args)
|
||||||
|
{
|
||||||
|
var viewModel = (sender as MenuItem)?.DataContext as MainWindowViewModel;
|
||||||
|
|
||||||
|
if (viewModel?.SelectedApplication != null)
|
||||||
|
{
|
||||||
|
await DownloadableContentManagerWindow.Show(viewModel.VirtualFileSystem, ulong.Parse(viewModel.SelectedApplication.TitleId, NumberStyles.HexNumber), viewModel.SelectedApplication.TitleName);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public async void OpenCheatManager_Click(object sender, RoutedEventArgs args)
|
||||||
|
{
|
||||||
|
var viewModel = (sender as MenuItem)?.DataContext as MainWindowViewModel;
|
||||||
|
|
||||||
|
if (viewModel?.SelectedApplication != null)
|
||||||
|
{
|
||||||
|
await new CheatWindow(
|
||||||
|
viewModel.VirtualFileSystem,
|
||||||
|
viewModel.SelectedApplication.TitleId,
|
||||||
|
viewModel.SelectedApplication.TitleName,
|
||||||
|
viewModel.SelectedApplication.Path).ShowDialog(viewModel.TopLevel as Window);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void OpenModsDirectory_Click(object sender, RoutedEventArgs args)
|
||||||
|
{
|
||||||
|
var viewModel = (sender as MenuItem)?.DataContext as MainWindowViewModel;
|
||||||
|
|
||||||
|
if (viewModel?.SelectedApplication != null)
|
||||||
|
{
|
||||||
|
string modsBasePath = ModLoader.GetModsBasePath();
|
||||||
|
string titleModsPath = ModLoader.GetTitleDir(modsBasePath, viewModel.SelectedApplication.TitleId);
|
||||||
|
|
||||||
|
OpenHelper.OpenFolder(titleModsPath);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void OpenSdModsDirectory_Click(object sender, RoutedEventArgs args)
|
||||||
|
{
|
||||||
|
var viewModel = (sender as MenuItem)?.DataContext as MainWindowViewModel;
|
||||||
|
|
||||||
|
if (viewModel?.SelectedApplication != null)
|
||||||
|
{
|
||||||
|
string sdModsBasePath = ModLoader.GetSdModsBasePath();
|
||||||
|
string titleModsPath = ModLoader.GetTitleDir(sdModsBasePath, viewModel.SelectedApplication.TitleId);
|
||||||
|
|
||||||
|
OpenHelper.OpenFolder(titleModsPath);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public async void PurgePtcCache_Click(object sender, RoutedEventArgs args)
|
||||||
|
{
|
||||||
|
var viewModel = (sender as MenuItem)?.DataContext as MainWindowViewModel;
|
||||||
|
|
||||||
|
if (viewModel?.SelectedApplication != null)
|
||||||
|
{
|
||||||
|
UserResult result = await ContentDialogHelper.CreateConfirmationDialog(LocaleManager.Instance[LocaleKeys.DialogWarning],
|
||||||
|
LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.DialogPPTCDeletionMessage, viewModel.SelectedApplication.TitleName),
|
||||||
|
LocaleManager.Instance[LocaleKeys.InputDialogYes],
|
||||||
|
LocaleManager.Instance[LocaleKeys.InputDialogNo],
|
||||||
|
LocaleManager.Instance[LocaleKeys.RyujinxConfirm]);
|
||||||
|
|
||||||
|
if (result == UserResult.Yes)
|
||||||
|
{
|
||||||
|
DirectoryInfo mainDir = new(Path.Combine(AppDataManager.GamesDirPath, viewModel.SelectedApplication.TitleId, "cache", "cpu", "0"));
|
||||||
|
DirectoryInfo backupDir = new(Path.Combine(AppDataManager.GamesDirPath, viewModel.SelectedApplication.TitleId, "cache", "cpu", "1"));
|
||||||
|
|
||||||
|
List<FileInfo> cacheFiles = new();
|
||||||
|
|
||||||
|
if (mainDir.Exists)
|
||||||
|
{
|
||||||
|
cacheFiles.AddRange(mainDir.EnumerateFiles("*.cache"));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (backupDir.Exists)
|
||||||
|
{
|
||||||
|
cacheFiles.AddRange(backupDir.EnumerateFiles("*.cache"));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (cacheFiles.Count > 0)
|
||||||
|
{
|
||||||
|
foreach (FileInfo file in cacheFiles)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
file.Delete();
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
await ContentDialogHelper.CreateErrorDialog(LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.DialogPPTCDeletionErrorMessage, file.Name, ex));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public async void PurgeShaderCache_Click(object sender, RoutedEventArgs args)
|
||||||
|
{
|
||||||
|
var viewModel = (sender as MenuItem)?.DataContext as MainWindowViewModel;
|
||||||
|
|
||||||
|
if (viewModel?.SelectedApplication != null)
|
||||||
|
{
|
||||||
|
UserResult result = await ContentDialogHelper.CreateConfirmationDialog(LocaleManager.Instance[LocaleKeys.DialogWarning],
|
||||||
|
LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.DialogShaderDeletionMessage, viewModel.SelectedApplication.TitleName),
|
||||||
|
LocaleManager.Instance[LocaleKeys.InputDialogYes],
|
||||||
|
LocaleManager.Instance[LocaleKeys.InputDialogNo],
|
||||||
|
LocaleManager.Instance[LocaleKeys.RyujinxConfirm]);
|
||||||
|
|
||||||
|
if (result == UserResult.Yes)
|
||||||
|
{
|
||||||
|
DirectoryInfo shaderCacheDir = new(Path.Combine(AppDataManager.GamesDirPath, viewModel.SelectedApplication.TitleId, "cache", "shader"));
|
||||||
|
|
||||||
|
List<DirectoryInfo> oldCacheDirectories = new();
|
||||||
|
List<FileInfo> newCacheFiles = new();
|
||||||
|
|
||||||
|
if (shaderCacheDir.Exists)
|
||||||
|
{
|
||||||
|
oldCacheDirectories.AddRange(shaderCacheDir.EnumerateDirectories("*"));
|
||||||
|
newCacheFiles.AddRange(shaderCacheDir.GetFiles("*.toc"));
|
||||||
|
newCacheFiles.AddRange(shaderCacheDir.GetFiles("*.data"));
|
||||||
|
}
|
||||||
|
|
||||||
|
if ((oldCacheDirectories.Count > 0 || newCacheFiles.Count > 0))
|
||||||
|
{
|
||||||
|
foreach (DirectoryInfo directory in oldCacheDirectories)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
directory.Delete(true);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
await ContentDialogHelper.CreateErrorDialog(LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.DialogPPTCDeletionErrorMessage, directory.Name, ex));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach (FileInfo file in newCacheFiles)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
file.Delete();
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
await ContentDialogHelper.CreateErrorDialog(LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.ShaderCachePurgeError, file.Name, ex));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void OpenPtcDirectory_Click(object sender, RoutedEventArgs args)
|
||||||
|
{
|
||||||
|
var viewModel = (sender as MenuItem)?.DataContext as MainWindowViewModel;
|
||||||
|
|
||||||
|
if (viewModel?.SelectedApplication != null)
|
||||||
|
{
|
||||||
|
string ptcDir = Path.Combine(AppDataManager.GamesDirPath, viewModel.SelectedApplication.TitleId, "cache", "cpu");
|
||||||
|
string mainDir = Path.Combine(ptcDir, "0");
|
||||||
|
string backupDir = Path.Combine(ptcDir, "1");
|
||||||
|
|
||||||
|
if (!Directory.Exists(ptcDir))
|
||||||
|
{
|
||||||
|
Directory.CreateDirectory(ptcDir);
|
||||||
|
Directory.CreateDirectory(mainDir);
|
||||||
|
Directory.CreateDirectory(backupDir);
|
||||||
|
}
|
||||||
|
|
||||||
|
OpenHelper.OpenFolder(ptcDir);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void OpenShaderCacheDirectory_Click(object sender, RoutedEventArgs args)
|
||||||
|
{
|
||||||
|
var viewModel = (sender as MenuItem)?.DataContext as MainWindowViewModel;
|
||||||
|
|
||||||
|
if (viewModel?.SelectedApplication != null)
|
||||||
|
{
|
||||||
|
string shaderCacheDir = Path.Combine(AppDataManager.GamesDirPath, viewModel.SelectedApplication.TitleId, "cache", "shader");
|
||||||
|
|
||||||
|
if (!Directory.Exists(shaderCacheDir))
|
||||||
|
{
|
||||||
|
Directory.CreateDirectory(shaderCacheDir);
|
||||||
|
}
|
||||||
|
|
||||||
|
OpenHelper.OpenFolder(shaderCacheDir);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public async void ExtractApplicationExeFs_Click(object sender, RoutedEventArgs args)
|
||||||
|
{
|
||||||
|
var viewModel = (sender as MenuItem)?.DataContext as MainWindowViewModel;
|
||||||
|
|
||||||
|
if (viewModel?.SelectedApplication != null)
|
||||||
|
{
|
||||||
|
await ApplicationHelper.ExtractSection(NcaSectionType.Code, viewModel.SelectedApplication.Path, viewModel.SelectedApplication.TitleName);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public async void ExtractApplicationRomFs_Click(object sender, RoutedEventArgs args)
|
||||||
|
{
|
||||||
|
var viewModel = (sender as MenuItem)?.DataContext as MainWindowViewModel;
|
||||||
|
|
||||||
|
if (viewModel?.SelectedApplication != null)
|
||||||
|
{
|
||||||
|
await ApplicationHelper.ExtractSection(NcaSectionType.Data, viewModel.SelectedApplication.Path, viewModel.SelectedApplication.TitleName);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public async void ExtractApplicationLogo_Click(object sender, RoutedEventArgs args)
|
||||||
|
{
|
||||||
|
var viewModel = (sender as MenuItem)?.DataContext as MainWindowViewModel;
|
||||||
|
|
||||||
|
if (viewModel?.SelectedApplication != null)
|
||||||
|
{
|
||||||
|
await ApplicationHelper.ExtractSection(NcaSectionType.Logo, viewModel.SelectedApplication.Path, viewModel.SelectedApplication.TitleName);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
102
src/Ryujinx.Ava/UI/Controls/ApplicationGridView.axaml
Normal file
102
src/Ryujinx.Ava/UI/Controls/ApplicationGridView.axaml
Normal file
@@ -0,0 +1,102 @@
|
|||||||
|
<UserControl
|
||||||
|
x:Class="Ryujinx.Ava.UI.Controls.ApplicationGridView"
|
||||||
|
xmlns="https://github.com/avaloniaui"
|
||||||
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
|
xmlns:controls="clr-namespace:Ryujinx.Ava.UI.Controls"
|
||||||
|
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||||
|
xmlns:flex="clr-namespace:Avalonia.Flexbox;assembly=Avalonia.Flexbox"
|
||||||
|
xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers"
|
||||||
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||||
|
xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
|
||||||
|
d:DesignHeight="450"
|
||||||
|
d:DesignWidth="800"
|
||||||
|
Focusable="True"
|
||||||
|
mc:Ignorable="d">
|
||||||
|
<UserControl.Resources>
|
||||||
|
<helpers:BitmapArrayValueConverter x:Key="ByteImage" />
|
||||||
|
<controls:ApplicationContextMenu x:Key="ApplicationContextMenu" />
|
||||||
|
</UserControl.Resources>
|
||||||
|
<Grid>
|
||||||
|
<Grid.RowDefinitions>
|
||||||
|
<RowDefinition Height="*" />
|
||||||
|
</Grid.RowDefinitions>
|
||||||
|
<ListBox
|
||||||
|
Grid.Row="0"
|
||||||
|
Padding="8"
|
||||||
|
HorizontalAlignment="Stretch"
|
||||||
|
VerticalAlignment="Stretch"
|
||||||
|
ContextFlyout="{StaticResource ApplicationContextMenu}"
|
||||||
|
DoubleTapped="GameList_DoubleTapped"
|
||||||
|
Items="{Binding AppsObservableList}"
|
||||||
|
SelectionChanged="GameList_SelectionChanged">
|
||||||
|
<ListBox.ItemsPanel>
|
||||||
|
<ItemsPanelTemplate>
|
||||||
|
<flex:FlexPanel
|
||||||
|
HorizontalAlignment="Stretch"
|
||||||
|
VerticalAlignment="Stretch"
|
||||||
|
AlignContent="FlexStart"
|
||||||
|
JustifyContent="Center" />
|
||||||
|
</ItemsPanelTemplate>
|
||||||
|
</ListBox.ItemsPanel>
|
||||||
|
<ListBox.Styles>
|
||||||
|
<Style Selector="ListBoxItem">
|
||||||
|
<Setter Property="Margin" Value="5" />
|
||||||
|
<Setter Property="CornerRadius" Value="4" />
|
||||||
|
</Style>
|
||||||
|
<Style Selector="ListBoxItem:selected /template/ Border#SelectionIndicator">
|
||||||
|
<Setter Property="MinHeight" Value="{Binding $parent[UserControl].DataContext.GridItemSelectorSize}" />
|
||||||
|
</Style>
|
||||||
|
</ListBox.Styles>
|
||||||
|
<ListBox.ItemTemplate>
|
||||||
|
<DataTemplate>
|
||||||
|
<Grid>
|
||||||
|
<Border
|
||||||
|
Margin="10"
|
||||||
|
HorizontalAlignment="Stretch"
|
||||||
|
VerticalAlignment="Stretch"
|
||||||
|
Classes.huge="{Binding $parent[UserControl].DataContext.IsGridHuge}"
|
||||||
|
Classes.large="{Binding $parent[UserControl].DataContext.IsGridLarge}"
|
||||||
|
Classes.normal="{Binding $parent[UserControl].DataContext.IsGridMedium}"
|
||||||
|
Classes.small="{Binding $parent[UserControl].DataContext.IsGridSmall}"
|
||||||
|
ClipToBounds="True"
|
||||||
|
CornerRadius="4">
|
||||||
|
<Grid>
|
||||||
|
<Grid.RowDefinitions>
|
||||||
|
<RowDefinition Height="Auto" />
|
||||||
|
<RowDefinition Height="Auto" />
|
||||||
|
</Grid.RowDefinitions>
|
||||||
|
<Image
|
||||||
|
Grid.Row="0"
|
||||||
|
HorizontalAlignment="Stretch"
|
||||||
|
VerticalAlignment="Top"
|
||||||
|
Source="{Binding Icon, Converter={StaticResource ByteImage}}" />
|
||||||
|
<Panel
|
||||||
|
Grid.Row="1"
|
||||||
|
Height="50"
|
||||||
|
Margin="0,10,0,0"
|
||||||
|
HorizontalAlignment="Stretch"
|
||||||
|
VerticalAlignment="Stretch"
|
||||||
|
IsVisible="{Binding $parent[UserControl].DataContext.ShowNames}">
|
||||||
|
<TextBlock
|
||||||
|
HorizontalAlignment="Stretch"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
Text="{Binding TitleName}"
|
||||||
|
TextAlignment="Center"
|
||||||
|
TextWrapping="Wrap" />
|
||||||
|
</Panel>
|
||||||
|
</Grid>
|
||||||
|
</Border>
|
||||||
|
<ui:SymbolIcon
|
||||||
|
Margin="5,5,0,0"
|
||||||
|
HorizontalAlignment="Left"
|
||||||
|
VerticalAlignment="Top"
|
||||||
|
FontSize="16"
|
||||||
|
Foreground="{DynamicResource SystemAccentColor}"
|
||||||
|
IsVisible="{Binding Favorite}"
|
||||||
|
Symbol="StarFilled" />
|
||||||
|
</Grid>
|
||||||
|
</DataTemplate>
|
||||||
|
</ListBox.ItemTemplate>
|
||||||
|
</ListBox>
|
||||||
|
</Grid>
|
||||||
|
</UserControl>
|
@@ -9,10 +9,10 @@ using System;
|
|||||||
|
|
||||||
namespace Ryujinx.Ava.UI.Controls
|
namespace Ryujinx.Ava.UI.Controls
|
||||||
{
|
{
|
||||||
public partial class GameGridView : UserControl
|
public partial class ApplicationGridView : UserControl
|
||||||
{
|
{
|
||||||
public static readonly RoutedEvent<ApplicationOpenedEventArgs> ApplicationOpenedEvent =
|
public static readonly RoutedEvent<ApplicationOpenedEventArgs> ApplicationOpenedEvent =
|
||||||
RoutedEvent.Register<GameGridView, ApplicationOpenedEventArgs>(nameof(ApplicationOpened), RoutingStrategies.Bubble);
|
RoutedEvent.Register<ApplicationGridView, ApplicationOpenedEventArgs>(nameof(ApplicationOpened), RoutingStrategies.Bubble);
|
||||||
|
|
||||||
public event EventHandler<ApplicationOpenedEventArgs> ApplicationOpened
|
public event EventHandler<ApplicationOpenedEventArgs> ApplicationOpened
|
||||||
{
|
{
|
||||||
@@ -20,7 +20,7 @@ namespace Ryujinx.Ava.UI.Controls
|
|||||||
remove { RemoveHandler(ApplicationOpenedEvent, value); }
|
remove { RemoveHandler(ApplicationOpenedEvent, value); }
|
||||||
}
|
}
|
||||||
|
|
||||||
public GameGridView()
|
public ApplicationGridView()
|
||||||
{
|
{
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
}
|
}
|
||||||
@@ -49,7 +49,7 @@ namespace Ryujinx.Ava.UI.Controls
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void SearchBox_OnKeyUp(object sender, KeyEventArgs e)
|
private void SearchBox_OnKeyUp(object sender, KeyEventArgs args)
|
||||||
{
|
{
|
||||||
(DataContext as MainWindowViewModel).SearchText = (sender as TextBox).Text;
|
(DataContext as MainWindowViewModel).SearchText = (sender as TextBox).Text;
|
||||||
}
|
}
|
@@ -1,10 +1,10 @@
|
|||||||
<UserControl
|
<UserControl
|
||||||
x:Class="Ryujinx.Ava.UI.Controls.GameListView"
|
x:Class="Ryujinx.Ava.UI.Controls.ApplicationListView"
|
||||||
xmlns="https://github.com/avaloniaui"
|
xmlns="https://github.com/avaloniaui"
|
||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
|
xmlns:controls="clr-namespace:Ryujinx.Ava.UI.Controls"
|
||||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||||
xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers"
|
xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers"
|
||||||
xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
|
|
||||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||||
xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
|
xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
|
||||||
d:DesignHeight="450"
|
d:DesignHeight="450"
|
||||||
@@ -13,82 +13,7 @@
|
|||||||
mc:Ignorable="d">
|
mc:Ignorable="d">
|
||||||
<UserControl.Resources>
|
<UserControl.Resources>
|
||||||
<helpers:BitmapArrayValueConverter x:Key="ByteImage" />
|
<helpers:BitmapArrayValueConverter x:Key="ByteImage" />
|
||||||
<MenuFlyout x:Key="GameContextMenu">
|
<controls:ApplicationContextMenu x:Key="ApplicationContextMenu" />
|
||||||
<MenuItem
|
|
||||||
Command="{Binding ToggleFavorite}"
|
|
||||||
Header="{locale:Locale GameListContextMenuToggleFavorite}"
|
|
||||||
ToolTip.Tip="{locale:Locale GameListContextMenuToggleFavoriteToolTip}" />
|
|
||||||
<Separator />
|
|
||||||
<MenuItem
|
|
||||||
Command="{Binding OpenUserSaveDirectory}"
|
|
||||||
IsEnabled="{Binding EnabledUserSaveDirectory}"
|
|
||||||
Header="{locale:Locale GameListContextMenuOpenUserSaveDirectory}"
|
|
||||||
ToolTip.Tip="{locale:Locale GameListContextMenuOpenUserSaveDirectoryToolTip}" />
|
|
||||||
<MenuItem
|
|
||||||
Command="{Binding OpenDeviceSaveDirectory}"
|
|
||||||
IsEnabled="{Binding EnabledDeviceSaveDirectory}"
|
|
||||||
Header="{locale:Locale GameListContextMenuOpenDeviceSaveDirectory}"
|
|
||||||
ToolTip.Tip="{locale:Locale GameListContextMenuOpenDeviceSaveDirectoryToolTip}" />
|
|
||||||
<MenuItem
|
|
||||||
Command="{Binding OpenBcatSaveDirectory}"
|
|
||||||
IsEnabled="{Binding EnabledBcatSaveDirectory}"
|
|
||||||
Header="{locale:Locale GameListContextMenuOpenBcatSaveDirectory}"
|
|
||||||
ToolTip.Tip="{locale:Locale GameListContextMenuOpenBcatSaveDirectoryToolTip}" />
|
|
||||||
<Separator />
|
|
||||||
<MenuItem
|
|
||||||
Command="{Binding OpenTitleUpdateManager}"
|
|
||||||
Header="{locale:Locale GameListContextMenuManageTitleUpdates}"
|
|
||||||
ToolTip.Tip="{locale:Locale GameListContextMenuManageTitleUpdatesToolTip}" />
|
|
||||||
<MenuItem
|
|
||||||
Command="{Binding OpenDownloadableContentManager}"
|
|
||||||
Header="{locale:Locale GameListContextMenuManageDlc}"
|
|
||||||
ToolTip.Tip="{locale:Locale GameListContextMenuManageDlcToolTip}" />
|
|
||||||
<MenuItem
|
|
||||||
Command="{Binding OpenCheatManager}"
|
|
||||||
Header="{locale:Locale GameListContextMenuManageCheat}"
|
|
||||||
ToolTip.Tip="{locale:Locale GameListContextMenuManageCheatToolTip}" />
|
|
||||||
<MenuItem
|
|
||||||
Command="{Binding OpenModsDirectory}"
|
|
||||||
Header="{locale:Locale GameListContextMenuOpenModsDirectory}"
|
|
||||||
ToolTip.Tip="{locale:Locale GameListContextMenuOpenModsDirectoryToolTip}" />
|
|
||||||
<MenuItem
|
|
||||||
Command="{Binding OpenSdModsDirectory}"
|
|
||||||
Header="{locale:Locale GameListContextMenuOpenSdModsDirectory}"
|
|
||||||
ToolTip.Tip="{locale:Locale GameListContextMenuOpenSdModsDirectoryToolTip}" />
|
|
||||||
<Separator />
|
|
||||||
<MenuItem Header="{locale:Locale GameListContextMenuCacheManagement}">
|
|
||||||
<MenuItem
|
|
||||||
Command="{Binding PurgePtcCache}"
|
|
||||||
Header="{locale:Locale GameListContextMenuCacheManagementPurgePptc}"
|
|
||||||
ToolTip.Tip="{locale:Locale GameListContextMenuCacheManagementPurgePptcToolTip}" />
|
|
||||||
<MenuItem
|
|
||||||
Command="{Binding PurgeShaderCache}"
|
|
||||||
Header="{locale:Locale GameListContextMenuCacheManagementPurgeShaderCache}"
|
|
||||||
ToolTip.Tip="{locale:Locale GameListContextMenuCacheManagementPurgeShaderCacheToolTip}" />
|
|
||||||
<MenuItem
|
|
||||||
Command="{Binding OpenPtcDirectory}"
|
|
||||||
Header="{locale:Locale GameListContextMenuCacheManagementOpenPptcDirectory}"
|
|
||||||
ToolTip.Tip="{locale:Locale GameListContextMenuCacheManagementOpenPptcDirectoryToolTip}" />
|
|
||||||
<MenuItem
|
|
||||||
Command="{Binding OpenShaderCacheDirectory}"
|
|
||||||
Header="{locale:Locale GameListContextMenuCacheManagementOpenShaderCacheDirectory}"
|
|
||||||
ToolTip.Tip="{locale:Locale GameListContextMenuCacheManagementOpenShaderCacheDirectoryToolTip}" />
|
|
||||||
</MenuItem>
|
|
||||||
<MenuItem Header="{locale:Locale GameListContextMenuExtractData}">
|
|
||||||
<MenuItem
|
|
||||||
Command="{Binding ExtractExeFs}"
|
|
||||||
Header="{locale:Locale GameListContextMenuExtractDataExeFS}"
|
|
||||||
ToolTip.Tip="{locale:Locale GameListContextMenuExtractDataExeFSToolTip}" />
|
|
||||||
<MenuItem
|
|
||||||
Command="{Binding ExtractRomFs}"
|
|
||||||
Header="{locale:Locale GameListContextMenuExtractDataRomFS}"
|
|
||||||
ToolTip.Tip="{locale:Locale GameListContextMenuExtractDataRomFSToolTip}" />
|
|
||||||
<MenuItem
|
|
||||||
Command="{Binding ExtractLogo}"
|
|
||||||
Header="{locale:Locale GameListContextMenuExtractDataLogo}"
|
|
||||||
ToolTip.Tip="{locale:Locale GameListContextMenuExtractDataLogoToolTip}" />
|
|
||||||
</MenuItem>
|
|
||||||
</MenuFlyout>
|
|
||||||
</UserControl.Resources>
|
</UserControl.Resources>
|
||||||
<Grid>
|
<Grid>
|
||||||
<Grid.RowDefinitions>
|
<Grid.RowDefinitions>
|
||||||
@@ -100,7 +25,7 @@
|
|||||||
Padding="8"
|
Padding="8"
|
||||||
HorizontalAlignment="Stretch"
|
HorizontalAlignment="Stretch"
|
||||||
VerticalAlignment="Stretch"
|
VerticalAlignment="Stretch"
|
||||||
ContextFlyout="{StaticResource GameContextMenu}"
|
ContextFlyout="{StaticResource ApplicationContextMenu}"
|
||||||
DoubleTapped="GameList_DoubleTapped"
|
DoubleTapped="GameList_DoubleTapped"
|
||||||
Items="{Binding AppsObservableList}"
|
Items="{Binding AppsObservableList}"
|
||||||
SelectionChanged="GameList_SelectionChanged">
|
SelectionChanged="GameList_SelectionChanged">
|
@@ -9,10 +9,10 @@ using System;
|
|||||||
|
|
||||||
namespace Ryujinx.Ava.UI.Controls
|
namespace Ryujinx.Ava.UI.Controls
|
||||||
{
|
{
|
||||||
public partial class GameListView : UserControl
|
public partial class ApplicationListView : UserControl
|
||||||
{
|
{
|
||||||
public static readonly RoutedEvent<ApplicationOpenedEventArgs> ApplicationOpenedEvent =
|
public static readonly RoutedEvent<ApplicationOpenedEventArgs> ApplicationOpenedEvent =
|
||||||
RoutedEvent.Register<GameGridView, ApplicationOpenedEventArgs>(nameof(ApplicationOpened), RoutingStrategies.Bubble);
|
RoutedEvent.Register<ApplicationListView, ApplicationOpenedEventArgs>(nameof(ApplicationOpened), RoutingStrategies.Bubble);
|
||||||
|
|
||||||
public event EventHandler<ApplicationOpenedEventArgs> ApplicationOpened
|
public event EventHandler<ApplicationOpenedEventArgs> ApplicationOpened
|
||||||
{
|
{
|
||||||
@@ -20,7 +20,7 @@ namespace Ryujinx.Ava.UI.Controls
|
|||||||
remove { RemoveHandler(ApplicationOpenedEvent, value); }
|
remove { RemoveHandler(ApplicationOpenedEvent, value); }
|
||||||
}
|
}
|
||||||
|
|
||||||
public GameListView()
|
public ApplicationListView()
|
||||||
{
|
{
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
}
|
}
|
||||||
@@ -49,7 +49,7 @@ namespace Ryujinx.Ava.UI.Controls
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void SearchBox_OnKeyUp(object sender, KeyEventArgs e)
|
private void SearchBox_OnKeyUp(object sender, KeyEventArgs args)
|
||||||
{
|
{
|
||||||
(DataContext as MainWindowViewModel).SearchText = (sender as TextBox).Text;
|
(DataContext as MainWindowViewModel).SearchText = (sender as TextBox).Text;
|
||||||
}
|
}
|
@@ -1,177 +0,0 @@
|
|||||||
<UserControl
|
|
||||||
x:Class="Ryujinx.Ava.UI.Controls.GameGridView"
|
|
||||||
xmlns="https://github.com/avaloniaui"
|
|
||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
|
||||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
|
||||||
xmlns:flex="clr-namespace:Avalonia.Flexbox;assembly=Avalonia.Flexbox"
|
|
||||||
xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
|
|
||||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
|
||||||
xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
|
|
||||||
xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers"
|
|
||||||
d:DesignHeight="450"
|
|
||||||
d:DesignWidth="800"
|
|
||||||
mc:Ignorable="d"
|
|
||||||
Focusable="True">
|
|
||||||
<UserControl.Resources>
|
|
||||||
<helpers:BitmapArrayValueConverter x:Key="ByteImage" />
|
|
||||||
<MenuFlyout x:Key="GameContextMenu">
|
|
||||||
<MenuItem
|
|
||||||
Command="{Binding ToggleFavorite}"
|
|
||||||
Header="{locale:Locale GameListContextMenuToggleFavorite}"
|
|
||||||
ToolTip.Tip="{locale:Locale GameListContextMenuToggleFavoriteToolTip}" />
|
|
||||||
<Separator />
|
|
||||||
<MenuItem
|
|
||||||
Command="{Binding OpenUserSaveDirectory}"
|
|
||||||
IsEnabled="{Binding EnabledUserSaveDirectory}"
|
|
||||||
Header="{locale:Locale GameListContextMenuOpenUserSaveDirectory}"
|
|
||||||
ToolTip.Tip="{locale:Locale GameListContextMenuOpenUserSaveDirectoryToolTip}" />
|
|
||||||
<MenuItem
|
|
||||||
Command="{Binding OpenDeviceSaveDirectory}"
|
|
||||||
IsEnabled="{Binding EnabledDeviceSaveDirectory}"
|
|
||||||
Header="{locale:Locale GameListContextMenuOpenDeviceSaveDirectory}"
|
|
||||||
ToolTip.Tip="{locale:Locale GameListContextMenuOpenDeviceSaveDirectoryToolTip}" />
|
|
||||||
<MenuItem
|
|
||||||
Command="{Binding OpenBcatSaveDirectory}"
|
|
||||||
IsEnabled="{Binding EnabledBcatSaveDirectory}"
|
|
||||||
Header="{locale:Locale GameListContextMenuOpenBcatSaveDirectory}"
|
|
||||||
ToolTip.Tip="{locale:Locale GameListContextMenuOpenBcatSaveDirectoryToolTip}" />
|
|
||||||
<Separator />
|
|
||||||
<MenuItem
|
|
||||||
Command="{Binding OpenTitleUpdateManager}"
|
|
||||||
Header="{locale:Locale GameListContextMenuManageTitleUpdates}"
|
|
||||||
ToolTip.Tip="{locale:Locale GameListContextMenuManageTitleUpdatesToolTip}" />
|
|
||||||
<MenuItem
|
|
||||||
Command="{Binding OpenDownloadableContentManager}"
|
|
||||||
Header="{locale:Locale GameListContextMenuManageDlc}"
|
|
||||||
ToolTip.Tip="{locale:Locale GameListContextMenuManageDlcToolTip}" />
|
|
||||||
<MenuItem
|
|
||||||
Command="{Binding OpenCheatManager}"
|
|
||||||
Header="{locale:Locale GameListContextMenuManageCheat}"
|
|
||||||
ToolTip.Tip="{locale:Locale GameListContextMenuManageCheatToolTip}" />
|
|
||||||
<MenuItem
|
|
||||||
Command="{Binding OpenModsDirectory}"
|
|
||||||
Header="{locale:Locale GameListContextMenuOpenModsDirectory}"
|
|
||||||
ToolTip.Tip="{locale:Locale GameListContextMenuOpenModsDirectoryToolTip}" />
|
|
||||||
<MenuItem
|
|
||||||
Command="{Binding OpenSdModsDirectory}"
|
|
||||||
Header="{locale:Locale GameListContextMenuOpenSdModsDirectory}"
|
|
||||||
ToolTip.Tip="{locale:Locale GameListContextMenuOpenSdModsDirectoryToolTip}" />
|
|
||||||
<Separator />
|
|
||||||
<MenuItem Header="{locale:Locale GameListContextMenuCacheManagement}">
|
|
||||||
<MenuItem
|
|
||||||
Command="{Binding PurgePtcCache}"
|
|
||||||
Header="{locale:Locale GameListContextMenuCacheManagementPurgePptc}"
|
|
||||||
ToolTip.Tip="{locale:Locale GameListContextMenuCacheManagementPurgePptcToolTip}" />
|
|
||||||
<MenuItem
|
|
||||||
Command="{Binding PurgeShaderCache}"
|
|
||||||
Header="{locale:Locale GameListContextMenuCacheManagementPurgeShaderCache}"
|
|
||||||
ToolTip.Tip="{locale:Locale GameListContextMenuCacheManagementPurgeShaderCacheToolTip}" />
|
|
||||||
<MenuItem
|
|
||||||
Command="{Binding OpenPtcDirectory}"
|
|
||||||
Header="{locale:Locale GameListContextMenuCacheManagementOpenPptcDirectory}"
|
|
||||||
ToolTip.Tip="{locale:Locale GameListContextMenuCacheManagementOpenPptcDirectoryToolTip}" />
|
|
||||||
<MenuItem
|
|
||||||
Command="{Binding OpenShaderCacheDirectory}"
|
|
||||||
Header="{locale:Locale GameListContextMenuCacheManagementOpenShaderCacheDirectory}"
|
|
||||||
ToolTip.Tip="{locale:Locale GameListContextMenuCacheManagementOpenShaderCacheDirectoryToolTip}" />
|
|
||||||
</MenuItem>
|
|
||||||
<MenuItem Header="{locale:Locale GameListContextMenuExtractData}">
|
|
||||||
<MenuItem
|
|
||||||
Command="{Binding ExtractExeFs}"
|
|
||||||
Header="{locale:Locale GameListContextMenuExtractDataExeFS}"
|
|
||||||
ToolTip.Tip="{locale:Locale GameListContextMenuExtractDataExeFSToolTip}" />
|
|
||||||
<MenuItem
|
|
||||||
Command="{Binding ExtractRomFs}"
|
|
||||||
Header="{locale:Locale GameListContextMenuExtractDataRomFS}"
|
|
||||||
ToolTip.Tip="{locale:Locale GameListContextMenuExtractDataRomFSToolTip}" />
|
|
||||||
<MenuItem
|
|
||||||
Command="{Binding ExtractLogo}"
|
|
||||||
Header="{locale:Locale GameListContextMenuExtractDataLogo}"
|
|
||||||
ToolTip.Tip="{locale:Locale GameListContextMenuExtractDataLogoToolTip}" />
|
|
||||||
</MenuItem>
|
|
||||||
</MenuFlyout>
|
|
||||||
</UserControl.Resources>
|
|
||||||
<Grid>
|
|
||||||
<Grid.RowDefinitions>
|
|
||||||
<RowDefinition Height="*" />
|
|
||||||
</Grid.RowDefinitions>
|
|
||||||
<ListBox
|
|
||||||
Grid.Row="0"
|
|
||||||
Padding="8"
|
|
||||||
HorizontalAlignment="Stretch"
|
|
||||||
VerticalAlignment="Stretch"
|
|
||||||
ContextFlyout="{StaticResource GameContextMenu}"
|
|
||||||
DoubleTapped="GameList_DoubleTapped"
|
|
||||||
Items="{Binding AppsObservableList}"
|
|
||||||
SelectionChanged="GameList_SelectionChanged">
|
|
||||||
<ListBox.ItemsPanel>
|
|
||||||
<ItemsPanelTemplate>
|
|
||||||
<flex:FlexPanel
|
|
||||||
HorizontalAlignment="Stretch"
|
|
||||||
VerticalAlignment="Stretch"
|
|
||||||
AlignContent="FlexStart"
|
|
||||||
JustifyContent="Center" />
|
|
||||||
</ItemsPanelTemplate>
|
|
||||||
</ListBox.ItemsPanel>
|
|
||||||
<ListBox.Styles>
|
|
||||||
<Style Selector="ListBoxItem">
|
|
||||||
<Setter Property="Margin" Value="5" />
|
|
||||||
<Setter Property="CornerRadius" Value="4" />
|
|
||||||
</Style>
|
|
||||||
<Style Selector="ListBoxItem:selected /template/ Border#SelectionIndicator">
|
|
||||||
<Setter Property="MinHeight" Value="{Binding $parent[UserControl].DataContext.GridItemSelectorSize}" />
|
|
||||||
</Style>
|
|
||||||
</ListBox.Styles>
|
|
||||||
<ListBox.ItemTemplate>
|
|
||||||
<DataTemplate>
|
|
||||||
<Grid>
|
|
||||||
<Border
|
|
||||||
Margin="10"
|
|
||||||
HorizontalAlignment="Stretch"
|
|
||||||
VerticalAlignment="Stretch"
|
|
||||||
Classes.huge="{Binding $parent[UserControl].DataContext.IsGridHuge}"
|
|
||||||
Classes.large="{Binding $parent[UserControl].DataContext.IsGridLarge}"
|
|
||||||
Classes.normal="{Binding $parent[UserControl].DataContext.IsGridMedium}"
|
|
||||||
Classes.small="{Binding $parent[UserControl].DataContext.IsGridSmall}"
|
|
||||||
ClipToBounds="True"
|
|
||||||
CornerRadius="4">
|
|
||||||
<Grid>
|
|
||||||
<Grid.RowDefinitions>
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
</Grid.RowDefinitions>
|
|
||||||
<Image
|
|
||||||
Grid.Row="0"
|
|
||||||
HorizontalAlignment="Stretch"
|
|
||||||
VerticalAlignment="Top"
|
|
||||||
Source="{Binding Icon, Converter={StaticResource ByteImage}}" />
|
|
||||||
<Panel
|
|
||||||
Grid.Row="1"
|
|
||||||
Height="50"
|
|
||||||
Margin="0 10 0 0"
|
|
||||||
HorizontalAlignment="Stretch"
|
|
||||||
VerticalAlignment="Stretch"
|
|
||||||
IsVisible="{Binding $parent[UserControl].DataContext.ShowNames}">
|
|
||||||
<TextBlock
|
|
||||||
HorizontalAlignment="Stretch"
|
|
||||||
VerticalAlignment="Center"
|
|
||||||
Text="{Binding TitleName}"
|
|
||||||
TextAlignment="Center"
|
|
||||||
TextWrapping="Wrap" />
|
|
||||||
</Panel>
|
|
||||||
</Grid>
|
|
||||||
</Border>
|
|
||||||
<ui:SymbolIcon
|
|
||||||
Margin="5,5,0,0"
|
|
||||||
HorizontalAlignment="Left"
|
|
||||||
VerticalAlignment="Top"
|
|
||||||
FontSize="16"
|
|
||||||
Foreground="{DynamicResource SystemAccentColor}"
|
|
||||||
IsVisible="{Binding Favorite}"
|
|
||||||
Symbol="StarFilled" />
|
|
||||||
</Grid>
|
|
||||||
</DataTemplate>
|
|
||||||
</ListBox.ItemTemplate>
|
|
||||||
</ListBox>
|
|
||||||
</Grid>
|
|
||||||
</UserControl>
|
|
@@ -6,8 +6,6 @@ using Avalonia.Threading;
|
|||||||
using DynamicData;
|
using DynamicData;
|
||||||
using DynamicData.Binding;
|
using DynamicData.Binding;
|
||||||
using LibHac.Common;
|
using LibHac.Common;
|
||||||
using LibHac.Fs;
|
|
||||||
using LibHac.Tools.FsSystem.NcaUtils;
|
|
||||||
using Ryujinx.Ava.Common;
|
using Ryujinx.Ava.Common;
|
||||||
using Ryujinx.Ava.Common.Locale;
|
using Ryujinx.Ava.Common.Locale;
|
||||||
using Ryujinx.Ava.Input;
|
using Ryujinx.Ava.Input;
|
||||||
@@ -33,13 +31,11 @@ using SixLabors.ImageSharp.PixelFormats;
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Collections.ObjectModel;
|
using System.Collections.ObjectModel;
|
||||||
using System.Globalization;
|
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using Path = System.IO.Path;
|
using Path = System.IO.Path;
|
||||||
using ShaderCacheLoadingState = Ryujinx.Graphics.Gpu.Shader.ShaderCacheState;
|
using ShaderCacheLoadingState = Ryujinx.Graphics.Gpu.Shader.ShaderCacheState;
|
||||||
using UserId = LibHac.Fs.UserId;
|
|
||||||
|
|
||||||
namespace Ryujinx.Ava.UI.ViewModels
|
namespace Ryujinx.Ava.UI.ViewModels
|
||||||
{
|
{
|
||||||
@@ -346,11 +342,11 @@ namespace Ryujinx.Ava.UI.ViewModels
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public bool EnabledUserSaveDirectory => !Utilities.IsZeros(SelectedApplication.ControlHolder.ByteSpan) && SelectedApplication.ControlHolder.Value.UserAccountSaveDataSize > 0;
|
public bool OpenUserSaveDirectoryEnabled => !Utilities.IsZeros(SelectedApplication.ControlHolder.ByteSpan) && SelectedApplication.ControlHolder.Value.UserAccountSaveDataSize > 0;
|
||||||
|
|
||||||
public bool EnabledDeviceSaveDirectory => !Utilities.IsZeros(SelectedApplication.ControlHolder.ByteSpan) && SelectedApplication.ControlHolder.Value.DeviceSaveDataSize > 0;
|
public bool OpenDeviceSaveDirectoryEnabled => !Utilities.IsZeros(SelectedApplication.ControlHolder.ByteSpan) && SelectedApplication.ControlHolder.Value.DeviceSaveDataSize > 0;
|
||||||
|
|
||||||
public bool EnabledBcatSaveDirectory => !Utilities.IsZeros(SelectedApplication.ControlHolder.ByteSpan) && SelectedApplication.ControlHolder.Value.BcatDeliveryCacheStorageSize > 0;
|
public bool OpenBcatSaveDirectoryEnabled => !Utilities.IsZeros(SelectedApplication.ControlHolder.ByteSpan) && SelectedApplication.ControlHolder.Value.BcatDeliveryCacheStorageSize > 0;
|
||||||
|
|
||||||
public string LoadHeading
|
public string LoadHeading
|
||||||
{
|
{
|
||||||
@@ -941,7 +937,7 @@ namespace Ryujinx.Ava.UI.ViewModels
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
private void RefreshView()
|
public void RefreshView()
|
||||||
{
|
{
|
||||||
RefreshGrid();
|
RefreshGrid();
|
||||||
}
|
}
|
||||||
@@ -1103,6 +1099,10 @@ namespace Ryujinx.Ava.UI.ViewModels
|
|||||||
LoadHeading = LocaleManager.Instance[LocaleKeys.CompilingShaders];
|
LoadHeading = LocaleManager.Instance[LocaleKeys.CompilingShaders];
|
||||||
IsLoadingIndeterminate = false;
|
IsLoadingIndeterminate = false;
|
||||||
break;
|
break;
|
||||||
|
case ShaderCacheLoadingState.Packaging:
|
||||||
|
LoadHeading = LocaleManager.Instance[LocaleKeys.PackagingShaders];
|
||||||
|
IsLoadingIndeterminate = false;
|
||||||
|
break;
|
||||||
case ShaderCacheLoadingState.Loaded:
|
case ShaderCacheLoadingState.Loaded:
|
||||||
LoadHeading = LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.LoadingHeading, TitleName);
|
LoadHeading = LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.LoadingHeading, TitleName);
|
||||||
IsLoadingIndeterminate = true;
|
IsLoadingIndeterminate = true;
|
||||||
@@ -1116,30 +1116,6 @@ namespace Ryujinx.Ava.UI.ViewModels
|
|||||||
}));
|
}));
|
||||||
}
|
}
|
||||||
|
|
||||||
private async void ExtractLogo()
|
|
||||||
{
|
|
||||||
if (SelectedApplication != null)
|
|
||||||
{
|
|
||||||
await ApplicationHelper.ExtractSection(NcaSectionType.Logo, SelectedApplication.Path, SelectedApplication.TitleName);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private async void ExtractRomFs()
|
|
||||||
{
|
|
||||||
if (SelectedApplication != null)
|
|
||||||
{
|
|
||||||
await ApplicationHelper.ExtractSection(NcaSectionType.Data, SelectedApplication.Path, SelectedApplication.TitleName);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private async void ExtractExeFs()
|
|
||||||
{
|
|
||||||
if (SelectedApplication != null)
|
|
||||||
{
|
|
||||||
await ApplicationHelper.ExtractSection(NcaSectionType.Code, SelectedApplication.Path, SelectedApplication.TitleName);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void PrepareLoadScreen()
|
private void PrepareLoadScreen()
|
||||||
{
|
{
|
||||||
using MemoryStream stream = new(SelectedIcon);
|
using MemoryStream stream = new(SelectedIcon);
|
||||||
@@ -1383,241 +1359,11 @@ namespace Ryujinx.Ava.UI.ViewModels
|
|||||||
await NavigationDialogHost.Show(AccountManager, ContentManager, VirtualFileSystem, LibHacHorizonManager.RyujinxClient);
|
await NavigationDialogHost.Show(AccountManager, ContentManager, VirtualFileSystem, LibHacHorizonManager.RyujinxClient);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void OpenPtcDirectory()
|
|
||||||
{
|
|
||||||
ApplicationData selection = SelectedApplication;
|
|
||||||
if (selection != null)
|
|
||||||
{
|
|
||||||
string ptcDir = Path.Combine(AppDataManager.GamesDirPath, selection.TitleId, "cache", "cpu");
|
|
||||||
string mainPath = Path.Combine(ptcDir, "0");
|
|
||||||
string backupPath = Path.Combine(ptcDir, "1");
|
|
||||||
|
|
||||||
if (!Directory.Exists(ptcDir))
|
|
||||||
{
|
|
||||||
Directory.CreateDirectory(ptcDir);
|
|
||||||
Directory.CreateDirectory(mainPath);
|
|
||||||
Directory.CreateDirectory(backupPath);
|
|
||||||
}
|
|
||||||
|
|
||||||
OpenHelper.OpenFolder(ptcDir);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public async void PurgePtcCache()
|
|
||||||
{
|
|
||||||
ApplicationData selection = SelectedApplication;
|
|
||||||
if (selection != null)
|
|
||||||
{
|
|
||||||
DirectoryInfo mainDir = new(Path.Combine(AppDataManager.GamesDirPath, selection.TitleId, "cache", "cpu", "0"));
|
|
||||||
DirectoryInfo backupDir = new(Path.Combine(AppDataManager.GamesDirPath, selection.TitleId, "cache", "cpu", "1"));
|
|
||||||
|
|
||||||
// FIXME: Found a way to reproduce the bold effect on the title name (fork?).
|
|
||||||
UserResult result = await ContentDialogHelper.CreateConfirmationDialog(LocaleManager.Instance[LocaleKeys.DialogWarning],
|
|
||||||
LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.DialogPPTCDeletionMessage, selection.TitleName),
|
|
||||||
LocaleManager.Instance[LocaleKeys.InputDialogYes],
|
|
||||||
LocaleManager.Instance[LocaleKeys.InputDialogNo],
|
|
||||||
LocaleManager.Instance[LocaleKeys.RyujinxConfirm]);
|
|
||||||
|
|
||||||
List<FileInfo> cacheFiles = new();
|
|
||||||
|
|
||||||
if (mainDir.Exists)
|
|
||||||
{
|
|
||||||
cacheFiles.AddRange(mainDir.EnumerateFiles("*.cache"));
|
|
||||||
}
|
|
||||||
|
|
||||||
if (backupDir.Exists)
|
|
||||||
{
|
|
||||||
cacheFiles.AddRange(backupDir.EnumerateFiles("*.cache"));
|
|
||||||
}
|
|
||||||
|
|
||||||
if (cacheFiles.Count > 0 && result == UserResult.Yes)
|
|
||||||
{
|
|
||||||
foreach (FileInfo file in cacheFiles)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
file.Delete();
|
|
||||||
}
|
|
||||||
catch (Exception e)
|
|
||||||
{
|
|
||||||
await ContentDialogHelper.CreateErrorDialog(LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.DialogPPTCDeletionErrorMessage, file.Name, e));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void OpenShaderCacheDirectory()
|
|
||||||
{
|
|
||||||
ApplicationData selection = SelectedApplication;
|
|
||||||
if (selection != null)
|
|
||||||
{
|
|
||||||
string shaderCacheDir = Path.Combine(AppDataManager.GamesDirPath, selection.TitleId, "cache", "shader");
|
|
||||||
|
|
||||||
if (!Directory.Exists(shaderCacheDir))
|
|
||||||
{
|
|
||||||
Directory.CreateDirectory(shaderCacheDir);
|
|
||||||
}
|
|
||||||
|
|
||||||
OpenHelper.OpenFolder(shaderCacheDir);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void SimulateWakeUpMessage()
|
public void SimulateWakeUpMessage()
|
||||||
{
|
{
|
||||||
AppHost.Device.System.SimulateWakeUpMessage();
|
AppHost.Device.System.SimulateWakeUpMessage();
|
||||||
}
|
}
|
||||||
|
|
||||||
public async void PurgeShaderCache()
|
|
||||||
{
|
|
||||||
ApplicationData selection = SelectedApplication;
|
|
||||||
if (selection != null)
|
|
||||||
{
|
|
||||||
DirectoryInfo shaderCacheDir = new(Path.Combine(AppDataManager.GamesDirPath, selection.TitleId, "cache", "shader"));
|
|
||||||
|
|
||||||
// FIXME: Found a way to reproduce the bold effect on the title name (fork?).
|
|
||||||
UserResult result = await ContentDialogHelper.CreateConfirmationDialog(LocaleManager.Instance[LocaleKeys.DialogWarning],
|
|
||||||
LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.DialogShaderDeletionMessage, selection.TitleName),
|
|
||||||
LocaleManager.Instance[LocaleKeys.InputDialogYes],
|
|
||||||
LocaleManager.Instance[LocaleKeys.InputDialogNo],
|
|
||||||
LocaleManager.Instance[LocaleKeys.RyujinxConfirm]);
|
|
||||||
|
|
||||||
List<DirectoryInfo> oldCacheDirectories = new();
|
|
||||||
List<FileInfo> newCacheFiles = new();
|
|
||||||
|
|
||||||
if (shaderCacheDir.Exists)
|
|
||||||
{
|
|
||||||
oldCacheDirectories.AddRange(shaderCacheDir.EnumerateDirectories("*"));
|
|
||||||
newCacheFiles.AddRange(shaderCacheDir.GetFiles("*.toc"));
|
|
||||||
newCacheFiles.AddRange(shaderCacheDir.GetFiles("*.data"));
|
|
||||||
}
|
|
||||||
|
|
||||||
if ((oldCacheDirectories.Count > 0 || newCacheFiles.Count > 0) && result == UserResult.Yes)
|
|
||||||
{
|
|
||||||
foreach (DirectoryInfo directory in oldCacheDirectories)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
directory.Delete(true);
|
|
||||||
}
|
|
||||||
catch (Exception e)
|
|
||||||
{
|
|
||||||
await ContentDialogHelper.CreateErrorDialog(LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.DialogPPTCDeletionErrorMessage, directory.Name, e));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
foreach (FileInfo file in newCacheFiles)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
file.Delete();
|
|
||||||
}
|
|
||||||
catch (Exception e)
|
|
||||||
{
|
|
||||||
await ContentDialogHelper.CreateErrorDialog(LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.ShaderCachePurgeError, file.Name, e));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void ToggleFavorite()
|
|
||||||
{
|
|
||||||
ApplicationData selection = SelectedApplication;
|
|
||||||
if (selection != null)
|
|
||||||
{
|
|
||||||
selection.Favorite = !selection.Favorite;
|
|
||||||
|
|
||||||
ApplicationLibrary.LoadAndSaveMetaData(selection.TitleId, appMetadata =>
|
|
||||||
{
|
|
||||||
appMetadata.Favorite = selection.Favorite;
|
|
||||||
});
|
|
||||||
|
|
||||||
RefreshView();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void OpenUserSaveDirectory()
|
|
||||||
{
|
|
||||||
OpenSaveDirectory(SaveDataType.Account, userId: new UserId((ulong)AccountManager.LastOpenedUser.UserId.High, (ulong)AccountManager.LastOpenedUser.UserId.Low));
|
|
||||||
}
|
|
||||||
|
|
||||||
public void OpenDeviceSaveDirectory()
|
|
||||||
{
|
|
||||||
OpenSaveDirectory(SaveDataType.Device, userId: default);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void OpenBcatSaveDirectory()
|
|
||||||
{
|
|
||||||
OpenSaveDirectory(SaveDataType.Bcat, userId: default);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void OpenSaveDirectory(SaveDataType saveDataType, UserId userId)
|
|
||||||
{
|
|
||||||
if (SelectedApplication != null)
|
|
||||||
{
|
|
||||||
if (!ulong.TryParse(SelectedApplication.TitleId, NumberStyles.HexNumber, CultureInfo.InvariantCulture, out ulong titleIdNumber))
|
|
||||||
{
|
|
||||||
Dispatcher.UIThread.InvokeAsync(async () =>
|
|
||||||
{
|
|
||||||
await ContentDialogHelper.CreateErrorDialog(LocaleManager.Instance[LocaleKeys.DialogRyujinxErrorMessage], LocaleManager.Instance[LocaleKeys.DialogInvalidTitleIdErrorMessage]);
|
|
||||||
});
|
|
||||||
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
var saveDataFilter = SaveDataFilter.Make(titleIdNumber, saveDataType, userId, saveDataId: default, index: default);
|
|
||||||
|
|
||||||
ApplicationHelper.OpenSaveDir(in saveDataFilter, titleIdNumber, SelectedApplication.ControlHolder, SelectedApplication.TitleName);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void OpenModsDirectory()
|
|
||||||
{
|
|
||||||
if (SelectedApplication != null)
|
|
||||||
{
|
|
||||||
string modsBasePath = VirtualFileSystem.ModLoader.GetModsBasePath();
|
|
||||||
string titleModsPath = VirtualFileSystem.ModLoader.GetTitleDir(modsBasePath, SelectedApplication.TitleId);
|
|
||||||
|
|
||||||
OpenHelper.OpenFolder(titleModsPath);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void OpenSdModsDirectory()
|
|
||||||
{
|
|
||||||
if (SelectedApplication != null)
|
|
||||||
{
|
|
||||||
string sdModsBasePath = VirtualFileSystem.ModLoader.GetSdModsBasePath();
|
|
||||||
string titleModsPath = VirtualFileSystem.ModLoader.GetTitleDir(sdModsBasePath, SelectedApplication.TitleId);
|
|
||||||
|
|
||||||
OpenHelper.OpenFolder(titleModsPath);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public async void OpenTitleUpdateManager()
|
|
||||||
{
|
|
||||||
if (SelectedApplication != null)
|
|
||||||
{
|
|
||||||
await TitleUpdateWindow.Show(VirtualFileSystem, ulong.Parse(SelectedApplication.TitleId, NumberStyles.HexNumber), SelectedApplication.TitleName);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public async void OpenDownloadableContentManager()
|
|
||||||
{
|
|
||||||
if (SelectedApplication != null)
|
|
||||||
{
|
|
||||||
await DownloadableContentManagerWindow.Show(VirtualFileSystem, ulong.Parse(SelectedApplication.TitleId, NumberStyles.HexNumber), SelectedApplication.TitleName);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public async void OpenCheatManager()
|
|
||||||
{
|
|
||||||
if (SelectedApplication != null)
|
|
||||||
{
|
|
||||||
await new CheatWindow(VirtualFileSystem, SelectedApplication.TitleId, SelectedApplication.TitleName).ShowDialog(TopLevel as Window);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public async void LoadApplications()
|
public async void LoadApplications()
|
||||||
{
|
{
|
||||||
await Dispatcher.UIThread.InvokeAsync(() =>
|
await Dispatcher.UIThread.InvokeAsync(() =>
|
||||||
|
@@ -132,7 +132,7 @@ namespace Ryujinx.Ava.UI.ViewModels
|
|||||||
public bool EnableDiscordIntegration { get; set; }
|
public bool EnableDiscordIntegration { get; set; }
|
||||||
public bool CheckUpdatesOnStart { get; set; }
|
public bool CheckUpdatesOnStart { get; set; }
|
||||||
public bool ShowConfirmExit { get; set; }
|
public bool ShowConfirmExit { get; set; }
|
||||||
public bool HideCursorOnIdle { get; set; }
|
public int HideCursor { get; set; }
|
||||||
public bool EnableDockedMode { get; set; }
|
public bool EnableDockedMode { get; set; }
|
||||||
public bool EnableKeyboard { get; set; }
|
public bool EnableKeyboard { get; set; }
|
||||||
public bool EnableMouse { get; set; }
|
public bool EnableMouse { get; set; }
|
||||||
@@ -238,8 +238,9 @@ namespace Ryujinx.Ava.UI.ViewModels
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public DateTimeOffset DateOffset { get; set; }
|
public DateTimeOffset CurrentDate { get; set; }
|
||||||
public TimeSpan TimeOffset { get; set; }
|
public TimeSpan CurrentTime { get; set; }
|
||||||
|
|
||||||
internal AvaloniaList<TimeZone> TimeZones { get; set; }
|
internal AvaloniaList<TimeZone> TimeZones { get; set; }
|
||||||
public AvaloniaList<string> GameDirectories { get; set; }
|
public AvaloniaList<string> GameDirectories { get; set; }
|
||||||
public ObservableCollection<ComboBoxItem> AvailableGpus { get; set; }
|
public ObservableCollection<ComboBoxItem> AvailableGpus { get; set; }
|
||||||
@@ -375,7 +376,7 @@ namespace Ryujinx.Ava.UI.ViewModels
|
|||||||
EnableDiscordIntegration = config.EnableDiscordIntegration;
|
EnableDiscordIntegration = config.EnableDiscordIntegration;
|
||||||
CheckUpdatesOnStart = config.CheckUpdatesOnStart;
|
CheckUpdatesOnStart = config.CheckUpdatesOnStart;
|
||||||
ShowConfirmExit = config.ShowConfirmExit;
|
ShowConfirmExit = config.ShowConfirmExit;
|
||||||
HideCursorOnIdle = config.HideCursorOnIdle;
|
HideCursor = (int)config.HideCursor.Value;
|
||||||
|
|
||||||
GameDirectories.Clear();
|
GameDirectories.Clear();
|
||||||
GameDirectories.AddRange(config.Ui.GameDirs.Value);
|
GameDirectories.AddRange(config.Ui.GameDirs.Value);
|
||||||
@@ -397,10 +398,11 @@ namespace Ryujinx.Ava.UI.ViewModels
|
|||||||
Language = (int)config.System.Language.Value;
|
Language = (int)config.System.Language.Value;
|
||||||
TimeZone = config.System.TimeZone;
|
TimeZone = config.System.TimeZone;
|
||||||
|
|
||||||
DateTime dateTimeOffset = DateTime.Now.AddSeconds(config.System.SystemTimeOffset);
|
DateTime currentDateTime = DateTime.Now;
|
||||||
|
|
||||||
|
CurrentDate = currentDateTime.Date;
|
||||||
|
CurrentTime = currentDateTime.TimeOfDay.Add(TimeSpan.FromSeconds(config.System.SystemTimeOffset));
|
||||||
|
|
||||||
DateOffset = dateTimeOffset.Date;
|
|
||||||
TimeOffset = dateTimeOffset.TimeOfDay;
|
|
||||||
EnableVsync = config.Graphics.EnableVsync;
|
EnableVsync = config.Graphics.EnableVsync;
|
||||||
EnableFsIntegrityChecks = config.System.EnableFsIntegrityChecks;
|
EnableFsIntegrityChecks = config.System.EnableFsIntegrityChecks;
|
||||||
ExpandDramSize = config.System.ExpandRam;
|
ExpandDramSize = config.System.ExpandRam;
|
||||||
@@ -458,7 +460,7 @@ namespace Ryujinx.Ava.UI.ViewModels
|
|||||||
config.EnableDiscordIntegration.Value = EnableDiscordIntegration;
|
config.EnableDiscordIntegration.Value = EnableDiscordIntegration;
|
||||||
config.CheckUpdatesOnStart.Value = CheckUpdatesOnStart;
|
config.CheckUpdatesOnStart.Value = CheckUpdatesOnStart;
|
||||||
config.ShowConfirmExit.Value = ShowConfirmExit;
|
config.ShowConfirmExit.Value = ShowConfirmExit;
|
||||||
config.HideCursorOnIdle.Value = HideCursorOnIdle;
|
config.HideCursor.Value = (HideCursorMode)HideCursor;
|
||||||
|
|
||||||
if (_directoryChanged)
|
if (_directoryChanged)
|
||||||
{
|
{
|
||||||
@@ -487,9 +489,7 @@ namespace Ryujinx.Ava.UI.ViewModels
|
|||||||
config.System.TimeZone.Value = TimeZone;
|
config.System.TimeZone.Value = TimeZone;
|
||||||
}
|
}
|
||||||
|
|
||||||
TimeSpan systemTimeOffset = DateOffset - DateTime.Now;
|
config.System.SystemTimeOffset.Value = Convert.ToInt64((CurrentDate.ToUnixTimeSeconds() + CurrentTime.TotalSeconds) - DateTimeOffset.Now.ToUnixTimeSeconds());
|
||||||
|
|
||||||
config.System.SystemTimeOffset.Value = systemTimeOffset.Seconds;
|
|
||||||
config.Graphics.EnableVsync.Value = EnableVsync;
|
config.Graphics.EnableVsync.Value = EnableVsync;
|
||||||
config.System.EnableFsIntegrityChecks.Value = EnableFsIntegrityChecks;
|
config.System.EnableFsIntegrityChecks.Value = EnableFsIntegrityChecks;
|
||||||
config.System.ExpandRam.Value = ExpandDramSize;
|
config.System.ExpandRam.Value = ExpandDramSize;
|
||||||
|
@@ -11,6 +11,7 @@ using Ryujinx.Common;
|
|||||||
using Ryujinx.Common.Utilities;
|
using Ryujinx.Common.Utilities;
|
||||||
using Ryujinx.HLE.HOS;
|
using Ryujinx.HLE.HOS;
|
||||||
using Ryujinx.Modules;
|
using Ryujinx.Modules;
|
||||||
|
using Ryujinx.Ui.App.Common;
|
||||||
using Ryujinx.Ui.Common;
|
using Ryujinx.Ui.Common;
|
||||||
using Ryujinx.Ui.Common.Configuration;
|
using Ryujinx.Ui.Common.Configuration;
|
||||||
using Ryujinx.Ui.Common.Helper;
|
using Ryujinx.Ui.Common.Helper;
|
||||||
@@ -176,7 +177,11 @@ namespace Ryujinx.Ava.UI.Views.Main
|
|||||||
|
|
||||||
string name = ViewModel.AppHost.Device.Processes.ActiveApplication.ApplicationControlProperties.Title[(int)ViewModel.AppHost.Device.System.State.DesiredTitleLanguage].NameString.ToString();
|
string name = ViewModel.AppHost.Device.Processes.ActiveApplication.ApplicationControlProperties.Title[(int)ViewModel.AppHost.Device.System.State.DesiredTitleLanguage].NameString.ToString();
|
||||||
|
|
||||||
await new CheatWindow(Window.VirtualFileSystem, ViewModel.AppHost.Device.Processes.ActiveApplication.ProgramIdText, name).ShowDialog(Window);
|
await new CheatWindow(
|
||||||
|
Window.VirtualFileSystem,
|
||||||
|
ViewModel.AppHost.Device.Processes.ActiveApplication.ProgramIdText,
|
||||||
|
name,
|
||||||
|
Window.ViewModel.SelectedApplication.Path).ShowDialog(Window);
|
||||||
|
|
||||||
ViewModel.AppHost.Device.EnableCheats();
|
ViewModel.AppHost.Device.EnableCheats();
|
||||||
}
|
}
|
||||||
|
@@ -3,12 +3,12 @@
|
|||||||
xmlns="https://github.com/avaloniaui"
|
xmlns="https://github.com/avaloniaui"
|
||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
|
||||||
xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
|
xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
|
||||||
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||||
xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
|
xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
|
||||||
mc:Ignorable="d"
|
|
||||||
x:CompileBindings="True"
|
x:CompileBindings="True"
|
||||||
x:DataType="viewModels:SettingsViewModel">
|
x:DataType="viewModels:SettingsViewModel"
|
||||||
|
mc:Ignorable="d">
|
||||||
<Design.DataContext>
|
<Design.DataContext>
|
||||||
<viewModels:SettingsViewModel />
|
<viewModels:SettingsViewModel />
|
||||||
</Design.DataContext>
|
</Design.DataContext>
|
||||||
@@ -27,13 +27,15 @@
|
|||||||
<TextBlock Classes="h1" Text="{locale:Locale SettingsTabSystemCore}" />
|
<TextBlock Classes="h1" Text="{locale:Locale SettingsTabSystemCore}" />
|
||||||
<StackPanel Margin="10,0,0,0" Orientation="Vertical">
|
<StackPanel Margin="10,0,0,0" Orientation="Vertical">
|
||||||
<StackPanel Margin="0,0,0,10" Orientation="Horizontal">
|
<StackPanel Margin="0,0,0,10" Orientation="Horizontal">
|
||||||
<TextBlock VerticalAlignment="Center"
|
<TextBlock
|
||||||
Text="{locale:Locale SettingsTabSystemSystemRegion}"
|
Width="250"
|
||||||
Width="250" />
|
VerticalAlignment="Center"
|
||||||
<ComboBox SelectedIndex="{Binding Region}"
|
Text="{locale:Locale SettingsTabSystemSystemRegion}" />
|
||||||
ToolTip.Tip="{locale:Locale RegionTooltip}"
|
<ComboBox
|
||||||
|
Width="350"
|
||||||
HorizontalContentAlignment="Left"
|
HorizontalContentAlignment="Left"
|
||||||
Width="350">
|
SelectedIndex="{Binding Region}"
|
||||||
|
ToolTip.Tip="{locale:Locale RegionTooltip}">
|
||||||
<ComboBoxItem>
|
<ComboBoxItem>
|
||||||
<TextBlock Text="{locale:Locale SettingsTabSystemSystemRegionJapan}" />
|
<TextBlock Text="{locale:Locale SettingsTabSystemSystemRegionJapan}" />
|
||||||
</ComboBoxItem>
|
</ComboBoxItem>
|
||||||
@@ -58,20 +60,21 @@
|
|||||||
</ComboBox>
|
</ComboBox>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
<StackPanel Margin="0,0,0,10" Orientation="Horizontal">
|
<StackPanel Margin="0,0,0,10" Orientation="Horizontal">
|
||||||
<TextBlock VerticalAlignment="Center"
|
<TextBlock
|
||||||
|
Width="250"
|
||||||
|
VerticalAlignment="Center"
|
||||||
Text="{locale:Locale SettingsTabSystemSystemLanguage}"
|
Text="{locale:Locale SettingsTabSystemSystemLanguage}"
|
||||||
ToolTip.Tip="{locale:Locale LanguageTooltip}"
|
ToolTip.Tip="{locale:Locale LanguageTooltip}" />
|
||||||
Width="250" />
|
<ComboBox
|
||||||
<ComboBox SelectedIndex="{Binding Language}"
|
Width="350"
|
||||||
ToolTip.Tip="{locale:Locale LanguageTooltip}"
|
|
||||||
HorizontalContentAlignment="Left"
|
HorizontalContentAlignment="Left"
|
||||||
Width="350">
|
SelectedIndex="{Binding Language}"
|
||||||
|
ToolTip.Tip="{locale:Locale LanguageTooltip}">
|
||||||
<ComboBoxItem>
|
<ComboBoxItem>
|
||||||
<TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageJapanese}" />
|
<TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageJapanese}" />
|
||||||
</ComboBoxItem>
|
</ComboBoxItem>
|
||||||
<ComboBoxItem>
|
<ComboBoxItem>
|
||||||
<TextBlock
|
<TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageAmericanEnglish}" />
|
||||||
Text="{locale:Locale SettingsTabSystemSystemLanguageAmericanEnglish}" />
|
|
||||||
</ComboBoxItem>
|
</ComboBoxItem>
|
||||||
<ComboBoxItem>
|
<ComboBoxItem>
|
||||||
<TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageFrench}" />
|
<TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageFrench}" />
|
||||||
@@ -104,71 +107,67 @@
|
|||||||
<TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageTaiwanese}" />
|
<TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageTaiwanese}" />
|
||||||
</ComboBoxItem>
|
</ComboBoxItem>
|
||||||
<ComboBoxItem>
|
<ComboBoxItem>
|
||||||
<TextBlock
|
<TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageBritishEnglish}" />
|
||||||
Text="{locale:Locale SettingsTabSystemSystemLanguageBritishEnglish}" />
|
|
||||||
</ComboBoxItem>
|
</ComboBoxItem>
|
||||||
<ComboBoxItem>
|
<ComboBoxItem>
|
||||||
<TextBlock
|
<TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageCanadianFrench}" />
|
||||||
Text="{locale:Locale SettingsTabSystemSystemLanguageCanadianFrench}" />
|
|
||||||
</ComboBoxItem>
|
</ComboBoxItem>
|
||||||
<ComboBoxItem>
|
<ComboBoxItem>
|
||||||
<TextBlock
|
<TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageLatinAmericanSpanish}" />
|
||||||
Text="{locale:Locale SettingsTabSystemSystemLanguageLatinAmericanSpanish}" />
|
|
||||||
</ComboBoxItem>
|
</ComboBoxItem>
|
||||||
<ComboBoxItem>
|
<ComboBoxItem>
|
||||||
<TextBlock
|
<TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageSimplifiedChinese}" />
|
||||||
Text="{locale:Locale SettingsTabSystemSystemLanguageSimplifiedChinese}" />
|
|
||||||
</ComboBoxItem>
|
</ComboBoxItem>
|
||||||
<ComboBoxItem>
|
<ComboBoxItem>
|
||||||
<TextBlock
|
<TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageTraditionalChinese}" />
|
||||||
Text="{locale:Locale SettingsTabSystemSystemLanguageTraditionalChinese}" />
|
|
||||||
</ComboBoxItem>
|
</ComboBoxItem>
|
||||||
<ComboBoxItem>
|
<ComboBoxItem>
|
||||||
<TextBlock
|
<TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageBrazilianPortuguese}" />
|
||||||
Text="{locale:Locale SettingsTabSystemSystemLanguageBrazilianPortuguese}" />
|
|
||||||
</ComboBoxItem>
|
</ComboBoxItem>
|
||||||
</ComboBox>
|
</ComboBox>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
<StackPanel Margin="0,0,0,10" Orientation="Horizontal">
|
<StackPanel Margin="0,0,0,10" Orientation="Horizontal">
|
||||||
<TextBlock VerticalAlignment="Center"
|
<TextBlock
|
||||||
|
Width="250"
|
||||||
|
VerticalAlignment="Center"
|
||||||
Text="{locale:Locale SettingsTabSystemSystemTimeZone}"
|
Text="{locale:Locale SettingsTabSystemSystemTimeZone}"
|
||||||
ToolTip.Tip="{locale:Locale TimezoneTooltip}"
|
ToolTip.Tip="{locale:Locale TimezoneTooltip}" />
|
||||||
Width="250" />
|
|
||||||
<AutoCompleteBox
|
<AutoCompleteBox
|
||||||
Name="TimeZoneBox"
|
Name="TimeZoneBox"
|
||||||
Width="350"
|
Width="350"
|
||||||
MaxDropDownHeight="500"
|
|
||||||
FilterMode="Contains"
|
FilterMode="Contains"
|
||||||
Items="{Binding TimeZones}"
|
Items="{Binding TimeZones}"
|
||||||
|
MaxDropDownHeight="500"
|
||||||
SelectionChanged="TimeZoneBox_OnSelectionChanged"
|
SelectionChanged="TimeZoneBox_OnSelectionChanged"
|
||||||
Text="{Binding Path=TimeZone, Mode=OneWay}"
|
Text="{Binding Path=TimeZone, Mode=OneWay}"
|
||||||
TextChanged="TimeZoneBox_OnTextChanged"
|
TextChanged="TimeZoneBox_OnTextChanged"
|
||||||
ToolTip.Tip="{locale:Locale TimezoneTooltip}" />
|
ToolTip.Tip="{locale:Locale TimezoneTooltip}" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
<StackPanel Margin="0,0,0,10" Orientation="Horizontal">
|
<StackPanel Margin="0,0,0,10" Orientation="Horizontal">
|
||||||
<TextBlock VerticalAlignment="Center"
|
<TextBlock
|
||||||
|
Width="250"
|
||||||
|
VerticalAlignment="Center"
|
||||||
Text="{locale:Locale SettingsTabSystemSystemTime}"
|
Text="{locale:Locale SettingsTabSystemSystemTime}"
|
||||||
ToolTip.Tip="{locale:Locale TimeTooltip}"
|
ToolTip.Tip="{locale:Locale TimeTooltip}" />
|
||||||
Width="250"/>
|
<DatePicker
|
||||||
<DatePicker VerticalAlignment="Center" SelectedDate="{Binding DateOffset}"
|
Width="350"
|
||||||
ToolTip.Tip="{locale:Locale TimeTooltip}"
|
VerticalAlignment="Center"
|
||||||
Width="350" />
|
SelectedDate="{Binding CurrentDate}"
|
||||||
|
ToolTip.Tip="{locale:Locale TimeTooltip}" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
<StackPanel Margin="250,0,0,10" Orientation="Horizontal">
|
<StackPanel Margin="250,0,0,10" Orientation="Horizontal">
|
||||||
<TimePicker
|
<TimePicker
|
||||||
|
Width="350"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
ClockIdentifier="24HourClock"
|
ClockIdentifier="24HourClock"
|
||||||
SelectedTime="{Binding TimeOffset}"
|
SelectedTime="{Binding CurrentTime}"
|
||||||
Width="350"
|
|
||||||
ToolTip.Tip="{locale:Locale TimeTooltip}" />
|
ToolTip.Tip="{locale:Locale TimeTooltip}" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
<CheckBox IsChecked="{Binding EnableVsync}">
|
<CheckBox IsChecked="{Binding EnableVsync}">
|
||||||
<TextBlock Text="{locale:Locale SettingsTabSystemEnableVsync}"
|
<TextBlock Text="{locale:Locale SettingsTabSystemEnableVsync}" ToolTip.Tip="{locale:Locale VSyncToggleTooltip}" />
|
||||||
ToolTip.Tip="{locale:Locale VSyncToggleTooltip}" />
|
|
||||||
</CheckBox>
|
</CheckBox>
|
||||||
<CheckBox IsChecked="{Binding EnableFsIntegrityChecks}">
|
<CheckBox IsChecked="{Binding EnableFsIntegrityChecks}">
|
||||||
<TextBlock Text="{locale:Locale SettingsTabSystemEnableFsIntegrityChecks}"
|
<TextBlock Text="{locale:Locale SettingsTabSystemEnableFsIntegrityChecks}" ToolTip.Tip="{locale:Locale FsIntegrityToggleTooltip}" />
|
||||||
ToolTip.Tip="{locale:Locale FsIntegrityToggleTooltip}" />
|
|
||||||
</CheckBox>
|
</CheckBox>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
<Separator Height="1" />
|
<Separator Height="1" />
|
||||||
@@ -180,12 +179,10 @@
|
|||||||
Margin="10,0,0,0"
|
Margin="10,0,0,0"
|
||||||
HorizontalAlignment="Stretch"
|
HorizontalAlignment="Stretch"
|
||||||
Orientation="Vertical">
|
Orientation="Vertical">
|
||||||
<CheckBox IsChecked="{Binding ExpandDramSize}"
|
<CheckBox IsChecked="{Binding ExpandDramSize}" ToolTip.Tip="{locale:Locale DRamTooltip}">
|
||||||
ToolTip.Tip="{locale:Locale DRamTooltip}">
|
|
||||||
<TextBlock Text="{locale:Locale SettingsTabSystemExpandDramSize}" />
|
<TextBlock Text="{locale:Locale SettingsTabSystemExpandDramSize}" />
|
||||||
</CheckBox>
|
</CheckBox>
|
||||||
<CheckBox IsChecked="{Binding IgnoreMissingServices}"
|
<CheckBox IsChecked="{Binding IgnoreMissingServices}" ToolTip.Tip="{locale:Locale IgnoreMissingServicesTooltip}">
|
||||||
ToolTip.Tip="{locale:Locale IgnoreMissingServicesTooltip}">
|
|
||||||
<TextBlock Text="{locale:Locale SettingsTabSystemIgnoreMissingServices}" />
|
<TextBlock Text="{locale:Locale SettingsTabSystemIgnoreMissingServices}" />
|
||||||
</CheckBox>
|
</CheckBox>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
|
@@ -37,9 +37,24 @@
|
|||||||
<CheckBox IsChecked="{Binding ShowConfirmExit}">
|
<CheckBox IsChecked="{Binding ShowConfirmExit}">
|
||||||
<TextBlock Text="{locale:Locale SettingsTabGeneralShowConfirmExitDialog}" />
|
<TextBlock Text="{locale:Locale SettingsTabGeneralShowConfirmExitDialog}" />
|
||||||
</CheckBox>
|
</CheckBox>
|
||||||
<CheckBox IsChecked="{Binding HideCursorOnIdle}">
|
<StackPanel Margin="0, 15, 0, 10" Orientation="Horizontal">
|
||||||
|
<TextBlock VerticalAlignment="Center"
|
||||||
|
Text="{locale:Locale SettingsTabGeneralHideCursor}"
|
||||||
|
Width="150" />
|
||||||
|
<ComboBox SelectedIndex="{Binding HideCursor}"
|
||||||
|
HorizontalContentAlignment="Left"
|
||||||
|
MinWidth="100">
|
||||||
|
<ComboBoxItem>
|
||||||
|
<TextBlock Text="{locale:Locale SettingsTabGeneralHideCursorNever}" />
|
||||||
|
</ComboBoxItem>
|
||||||
|
<ComboBoxItem>
|
||||||
<TextBlock Text="{locale:Locale SettingsTabGeneralHideCursorOnIdle}" />
|
<TextBlock Text="{locale:Locale SettingsTabGeneralHideCursorOnIdle}" />
|
||||||
</CheckBox>
|
</ComboBoxItem>
|
||||||
|
<ComboBoxItem>
|
||||||
|
<TextBlock Text="{locale:Locale SettingsTabGeneralHideCursorAlways}" />
|
||||||
|
</ComboBoxItem>
|
||||||
|
</ComboBox>
|
||||||
|
</StackPanel>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
<Separator Height="1" />
|
<Separator Height="1" />
|
||||||
<TextBlock Classes="h1" Text="{locale:Locale SettingsTabGeneralGameDirectories}" />
|
<TextBlock Classes="h1" Text="{locale:Locale SettingsTabGeneralGameDirectories}" />
|
||||||
|
@@ -21,23 +21,52 @@
|
|||||||
</Window.Styles>
|
</Window.Styles>
|
||||||
<Grid Name="CheatGrid" Margin="15">
|
<Grid Name="CheatGrid" Margin="15">
|
||||||
<Grid.RowDefinitions>
|
<Grid.RowDefinitions>
|
||||||
|
<RowDefinition Height="Auto" />
|
||||||
<RowDefinition Height="Auto" />
|
<RowDefinition Height="Auto" />
|
||||||
<RowDefinition Height="Auto" />
|
<RowDefinition Height="Auto" />
|
||||||
<RowDefinition Height="*" />
|
<RowDefinition Height="*" />
|
||||||
<RowDefinition Height="Auto" />
|
<RowDefinition Height="Auto" />
|
||||||
</Grid.RowDefinitions>
|
</Grid.RowDefinitions>
|
||||||
|
<Grid.ColumnDefinitions>
|
||||||
|
<ColumnDefinition Width="*" />
|
||||||
|
<ColumnDefinition Width="*" />
|
||||||
|
</Grid.ColumnDefinitions>
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Grid.Row="1"
|
Grid.Row="1"
|
||||||
|
Grid.Column="0"
|
||||||
|
Grid.ColumnSpan="2"
|
||||||
MaxWidth="500"
|
MaxWidth="500"
|
||||||
Margin="20,15,20,20"
|
Margin="20,15,20,5"
|
||||||
HorizontalAlignment="Center"
|
HorizontalAlignment="Center"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
LineHeight="18"
|
LineHeight="18"
|
||||||
Text="{Binding Heading}"
|
Text="{Binding Heading}"
|
||||||
TextAlignment="Center"
|
TextAlignment="Center"
|
||||||
TextWrapping="Wrap" />
|
TextWrapping="Wrap" />
|
||||||
<Border
|
<TextBlock
|
||||||
Grid.Row="2"
|
Grid.Row="2"
|
||||||
|
Grid.Column="0"
|
||||||
|
MaxWidth="500"
|
||||||
|
Margin="140,15,20,5"
|
||||||
|
HorizontalAlignment="Center"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
LineHeight="30"
|
||||||
|
Text="{locale:Locale BuildId}"
|
||||||
|
TextAlignment="Center"
|
||||||
|
TextWrapping="Wrap" />
|
||||||
|
<TextBox
|
||||||
|
Grid.Row="2"
|
||||||
|
Grid.Column="1"
|
||||||
|
Margin="0,5,110,5"
|
||||||
|
MinWidth="160"
|
||||||
|
HorizontalAlignment="Center"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
Text="{Binding BuildId}"
|
||||||
|
IsReadOnly="True" />
|
||||||
|
<Border
|
||||||
|
Grid.Row="3"
|
||||||
|
Grid.Column="0"
|
||||||
|
Grid.ColumnSpan="2"
|
||||||
Margin="5"
|
Margin="5"
|
||||||
HorizontalAlignment="Stretch"
|
HorizontalAlignment="Stretch"
|
||||||
VerticalAlignment="Stretch"
|
VerticalAlignment="Stretch"
|
||||||
@@ -81,7 +110,9 @@
|
|||||||
</TreeView>
|
</TreeView>
|
||||||
</Border>
|
</Border>
|
||||||
<DockPanel
|
<DockPanel
|
||||||
Grid.Row="3"
|
Grid.Row="4"
|
||||||
|
Grid.Column="0"
|
||||||
|
Grid.ColumnSpan="2"
|
||||||
Margin="0"
|
Margin="0"
|
||||||
HorizontalAlignment="Stretch">
|
HorizontalAlignment="Stretch">
|
||||||
<DockPanel Margin="0" HorizontalAlignment="Right">
|
<DockPanel Margin="0" HorizontalAlignment="Right">
|
||||||
|
@@ -1,8 +1,10 @@
|
|||||||
using Avalonia.Collections;
|
using Avalonia;
|
||||||
|
using Avalonia.Collections;
|
||||||
using Ryujinx.Ava.Common.Locale;
|
using Ryujinx.Ava.Common.Locale;
|
||||||
using Ryujinx.Ava.UI.Models;
|
using Ryujinx.Ava.UI.Models;
|
||||||
using Ryujinx.HLE.FileSystem;
|
using Ryujinx.HLE.FileSystem;
|
||||||
using Ryujinx.HLE.HOS;
|
using Ryujinx.HLE.HOS;
|
||||||
|
using Ryujinx.Ui.App.Common;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
@@ -17,6 +19,7 @@ namespace Ryujinx.Ava.UI.Windows
|
|||||||
private AvaloniaList<CheatsList> LoadedCheats { get; }
|
private AvaloniaList<CheatsList> LoadedCheats { get; }
|
||||||
|
|
||||||
public string Heading { get; }
|
public string Heading { get; }
|
||||||
|
public string BuildId { get; }
|
||||||
|
|
||||||
public CheatWindow()
|
public CheatWindow()
|
||||||
{
|
{
|
||||||
@@ -27,16 +30,17 @@ namespace Ryujinx.Ava.UI.Windows
|
|||||||
Title = $"Ryujinx {Program.Version} - " + LocaleManager.Instance[LocaleKeys.CheatWindowTitle];
|
Title = $"Ryujinx {Program.Version} - " + LocaleManager.Instance[LocaleKeys.CheatWindowTitle];
|
||||||
}
|
}
|
||||||
|
|
||||||
public CheatWindow(VirtualFileSystem virtualFileSystem, string titleId, string titleName)
|
public CheatWindow(VirtualFileSystem virtualFileSystem, string titleId, string titleName, string titlePath)
|
||||||
{
|
{
|
||||||
LoadedCheats = new AvaloniaList<CheatsList>();
|
LoadedCheats = new AvaloniaList<CheatsList>();
|
||||||
|
|
||||||
Heading = LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.CheatWindowHeading, titleName, titleId.ToUpper());
|
Heading = LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.CheatWindowHeading, titleName, titleId.ToUpper());
|
||||||
|
BuildId = ApplicationData.GetApplicationBuildId(virtualFileSystem, titlePath);
|
||||||
|
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
|
|
||||||
string modsBasePath = virtualFileSystem.ModLoader.GetModsBasePath();
|
string modsBasePath = ModLoader.GetModsBasePath();
|
||||||
string titleModsPath = virtualFileSystem.ModLoader.GetTitleDir(modsBasePath, titleId);
|
string titleModsPath = ModLoader.GetTitleDir(modsBasePath, titleId);
|
||||||
ulong titleIdValue = ulong.Parse(titleId, System.Globalization.NumberStyles.HexNumber);
|
ulong titleIdValue = ulong.Parse(titleId, System.Globalization.NumberStyles.HexNumber);
|
||||||
|
|
||||||
_enabledCheatsPath = Path.Combine(titleModsPath, "cheats", "enabled.txt");
|
_enabledCheatsPath = Path.Combine(titleModsPath, "cheats", "enabled.txt");
|
||||||
|
@@ -88,16 +88,16 @@
|
|||||||
<main:MainViewControls
|
<main:MainViewControls
|
||||||
Name="ViewControls"
|
Name="ViewControls"
|
||||||
Grid.Row="0"/>
|
Grid.Row="0"/>
|
||||||
<controls:GameListView
|
<controls:ApplicationListView
|
||||||
x:Name="GameList"
|
x:Name="ApplicationList"
|
||||||
Grid.Row="1"
|
Grid.Row="1"
|
||||||
HorizontalAlignment="Stretch"
|
HorizontalAlignment="Stretch"
|
||||||
VerticalAlignment="Stretch"
|
VerticalAlignment="Stretch"
|
||||||
HorizontalContentAlignment="Stretch"
|
HorizontalContentAlignment="Stretch"
|
||||||
VerticalContentAlignment="Stretch"
|
VerticalContentAlignment="Stretch"
|
||||||
IsVisible="{Binding IsList}" />
|
IsVisible="{Binding IsList}" />
|
||||||
<controls:GameGridView
|
<controls:ApplicationGridView
|
||||||
x:Name="GameGrid"
|
x:Name="ApplicationGrid"
|
||||||
Grid.Row="1"
|
Grid.Row="1"
|
||||||
HorizontalAlignment="Stretch"
|
HorizontalAlignment="Stretch"
|
||||||
VerticalAlignment="Stretch"
|
VerticalAlignment="Stretch"
|
||||||
|
@@ -288,13 +288,13 @@ namespace Ryujinx.Ava.UI.Windows
|
|||||||
{
|
{
|
||||||
StatusBarView.VolumeStatus.Click += VolumeStatus_CheckedChanged;
|
StatusBarView.VolumeStatus.Click += VolumeStatus_CheckedChanged;
|
||||||
|
|
||||||
GameGrid.ApplicationOpened += Application_Opened;
|
ApplicationGrid.ApplicationOpened += Application_Opened;
|
||||||
|
|
||||||
GameGrid.DataContext = ViewModel;
|
ApplicationGrid.DataContext = ViewModel;
|
||||||
|
|
||||||
GameList.ApplicationOpened += Application_Opened;
|
ApplicationList.ApplicationOpened += Application_Opened;
|
||||||
|
|
||||||
GameList.DataContext = ViewModel;
|
ApplicationList.DataContext = ViewModel;
|
||||||
|
|
||||||
LoadHotKeys();
|
LoadHotKeys();
|
||||||
}
|
}
|
||||||
|
9
src/Ryujinx.Common/Configuration/HideCursorMode.cs
Normal file
9
src/Ryujinx.Common/Configuration/HideCursorMode.cs
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
namespace Ryujinx.Common.Configuration
|
||||||
|
{
|
||||||
|
public enum HideCursorMode
|
||||||
|
{
|
||||||
|
Never,
|
||||||
|
OnIdle,
|
||||||
|
Always
|
||||||
|
}
|
||||||
|
}
|
@@ -1,5 +1,4 @@
|
|||||||
using ARMeilleure.Memory;
|
using ARMeilleure.Memory;
|
||||||
using Ryujinx.Cpu.Tracking;
|
|
||||||
using Ryujinx.Memory;
|
using Ryujinx.Memory;
|
||||||
using Ryujinx.Memory.Range;
|
using Ryujinx.Memory.Range;
|
||||||
using Ryujinx.Memory.Tracking;
|
using Ryujinx.Memory.Tracking;
|
||||||
@@ -822,21 +821,21 @@ namespace Ryujinx.Cpu.AppleHv
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <inheritdoc/>
|
/// <inheritdoc/>
|
||||||
public CpuRegionHandle BeginTracking(ulong address, ulong size, int id)
|
public RegionHandle BeginTracking(ulong address, ulong size, int id)
|
||||||
{
|
{
|
||||||
return new CpuRegionHandle(Tracking.BeginTracking(address, size, id));
|
return Tracking.BeginTracking(address, size, id);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <inheritdoc/>
|
/// <inheritdoc/>
|
||||||
public CpuMultiRegionHandle BeginGranularTracking(ulong address, ulong size, IEnumerable<IRegionHandle> handles, ulong granularity, int id)
|
public MultiRegionHandle BeginGranularTracking(ulong address, ulong size, IEnumerable<IRegionHandle> handles, ulong granularity, int id)
|
||||||
{
|
{
|
||||||
return new CpuMultiRegionHandle(Tracking.BeginGranularTracking(address, size, handles, granularity, id));
|
return Tracking.BeginGranularTracking(address, size, handles, granularity, id);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <inheritdoc/>
|
/// <inheritdoc/>
|
||||||
public CpuSmartMultiRegionHandle BeginSmartGranularTracking(ulong address, ulong size, ulong granularity, int id)
|
public SmartMultiRegionHandle BeginSmartGranularTracking(ulong address, ulong size, ulong granularity, int id)
|
||||||
{
|
{
|
||||||
return new CpuSmartMultiRegionHandle(Tracking.BeginSmartGranularTracking(address, size, granularity, id));
|
return Tracking.BeginSmartGranularTracking(address, size, granularity, id);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
@@ -1,5 +1,4 @@
|
|||||||
using Ryujinx.Cpu.Tracking;
|
using Ryujinx.Memory;
|
||||||
using Ryujinx.Memory;
|
|
||||||
using Ryujinx.Memory.Tracking;
|
using Ryujinx.Memory.Tracking;
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
@@ -30,7 +29,7 @@ namespace Ryujinx.Cpu
|
|||||||
/// <param name="size">Size of the region</param>
|
/// <param name="size">Size of the region</param>
|
||||||
/// <param name="id">Handle ID</param>
|
/// <param name="id">Handle ID</param>
|
||||||
/// <returns>The memory tracking handle</returns>
|
/// <returns>The memory tracking handle</returns>
|
||||||
CpuRegionHandle BeginTracking(ulong address, ulong size, int id);
|
RegionHandle BeginTracking(ulong address, ulong size, int id);
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Obtains a memory tracking handle for the given virtual region, with a specified granularity. This should be disposed when finished with.
|
/// Obtains a memory tracking handle for the given virtual region, with a specified granularity. This should be disposed when finished with.
|
||||||
@@ -41,7 +40,7 @@ namespace Ryujinx.Cpu
|
|||||||
/// <param name="granularity">Desired granularity of write tracking</param>
|
/// <param name="granularity">Desired granularity of write tracking</param>
|
||||||
/// <param name="id">Handle ID</param>
|
/// <param name="id">Handle ID</param>
|
||||||
/// <returns>The memory tracking handle</returns>
|
/// <returns>The memory tracking handle</returns>
|
||||||
CpuMultiRegionHandle BeginGranularTracking(ulong address, ulong size, IEnumerable<IRegionHandle> handles, ulong granularity, int id);
|
MultiRegionHandle BeginGranularTracking(ulong address, ulong size, IEnumerable<IRegionHandle> handles, ulong granularity, int id);
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Obtains a smart memory tracking handle for the given virtual region, with a specified granularity. This should be disposed when finished with.
|
/// Obtains a smart memory tracking handle for the given virtual region, with a specified granularity. This should be disposed when finished with.
|
||||||
@@ -51,6 +50,6 @@ namespace Ryujinx.Cpu
|
|||||||
/// <param name="granularity">Desired granularity of write tracking</param>
|
/// <param name="granularity">Desired granularity of write tracking</param>
|
||||||
/// <param name="id">Handle ID</param>
|
/// <param name="id">Handle ID</param>
|
||||||
/// <returns>The memory tracking handle</returns>
|
/// <returns>The memory tracking handle</returns>
|
||||||
CpuSmartMultiRegionHandle BeginSmartGranularTracking(ulong address, ulong size, ulong granularity, int id);
|
SmartMultiRegionHandle BeginSmartGranularTracking(ulong address, ulong size, ulong granularity, int id);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -1,5 +1,4 @@
|
|||||||
using ARMeilleure.Memory;
|
using ARMeilleure.Memory;
|
||||||
using Ryujinx.Cpu.Tracking;
|
|
||||||
using Ryujinx.Memory;
|
using Ryujinx.Memory;
|
||||||
using Ryujinx.Memory.Range;
|
using Ryujinx.Memory.Range;
|
||||||
using Ryujinx.Memory.Tracking;
|
using Ryujinx.Memory.Tracking;
|
||||||
@@ -629,21 +628,21 @@ namespace Ryujinx.Cpu.Jit
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <inheritdoc/>
|
/// <inheritdoc/>
|
||||||
public CpuRegionHandle BeginTracking(ulong address, ulong size, int id)
|
public RegionHandle BeginTracking(ulong address, ulong size, int id)
|
||||||
{
|
{
|
||||||
return new CpuRegionHandle(Tracking.BeginTracking(address, size, id));
|
return Tracking.BeginTracking(address, size, id);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <inheritdoc/>
|
/// <inheritdoc/>
|
||||||
public CpuMultiRegionHandle BeginGranularTracking(ulong address, ulong size, IEnumerable<IRegionHandle> handles, ulong granularity, int id)
|
public MultiRegionHandle BeginGranularTracking(ulong address, ulong size, IEnumerable<IRegionHandle> handles, ulong granularity, int id)
|
||||||
{
|
{
|
||||||
return new CpuMultiRegionHandle(Tracking.BeginGranularTracking(address, size, handles, granularity, id));
|
return Tracking.BeginGranularTracking(address, size, handles, granularity, id);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <inheritdoc/>
|
/// <inheritdoc/>
|
||||||
public CpuSmartMultiRegionHandle BeginSmartGranularTracking(ulong address, ulong size, ulong granularity, int id)
|
public SmartMultiRegionHandle BeginSmartGranularTracking(ulong address, ulong size, ulong granularity, int id)
|
||||||
{
|
{
|
||||||
return new CpuSmartMultiRegionHandle(Tracking.BeginSmartGranularTracking(address, size, granularity, id));
|
return Tracking.BeginSmartGranularTracking(address, size, granularity, id);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <inheritdoc/>
|
/// <inheritdoc/>
|
||||||
|
@@ -1,5 +1,4 @@
|
|||||||
using ARMeilleure.Memory;
|
using ARMeilleure.Memory;
|
||||||
using Ryujinx.Cpu.Tracking;
|
|
||||||
using Ryujinx.Memory;
|
using Ryujinx.Memory;
|
||||||
using Ryujinx.Memory.Range;
|
using Ryujinx.Memory.Range;
|
||||||
using Ryujinx.Memory.Tracking;
|
using Ryujinx.Memory.Tracking;
|
||||||
@@ -706,21 +705,21 @@ namespace Ryujinx.Cpu.Jit
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <inheritdoc/>
|
/// <inheritdoc/>
|
||||||
public CpuRegionHandle BeginTracking(ulong address, ulong size, int id)
|
public RegionHandle BeginTracking(ulong address, ulong size, int id)
|
||||||
{
|
{
|
||||||
return new CpuRegionHandle(Tracking.BeginTracking(address, size, id));
|
return Tracking.BeginTracking(address, size, id);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <inheritdoc/>
|
/// <inheritdoc/>
|
||||||
public CpuMultiRegionHandle BeginGranularTracking(ulong address, ulong size, IEnumerable<IRegionHandle> handles, ulong granularity, int id)
|
public MultiRegionHandle BeginGranularTracking(ulong address, ulong size, IEnumerable<IRegionHandle> handles, ulong granularity, int id)
|
||||||
{
|
{
|
||||||
return new CpuMultiRegionHandle(Tracking.BeginGranularTracking(address, size, handles, granularity, id));
|
return Tracking.BeginGranularTracking(address, size, handles, granularity, id);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <inheritdoc/>
|
/// <inheritdoc/>
|
||||||
public CpuSmartMultiRegionHandle BeginSmartGranularTracking(ulong address, ulong size, ulong granularity, int id)
|
public SmartMultiRegionHandle BeginSmartGranularTracking(ulong address, ulong size, ulong granularity, int id)
|
||||||
{
|
{
|
||||||
return new CpuSmartMultiRegionHandle(Tracking.BeginSmartGranularTracking(address, size, granularity, id));
|
return Tracking.BeginSmartGranularTracking(address, size, granularity, id);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
@@ -1,28 +0,0 @@
|
|||||||
using Ryujinx.Memory.Tracking;
|
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
|
|
||||||
namespace Ryujinx.Cpu.Tracking
|
|
||||||
{
|
|
||||||
public class CpuMultiRegionHandle : IMultiRegionHandle
|
|
||||||
{
|
|
||||||
private readonly MultiRegionHandle _impl;
|
|
||||||
|
|
||||||
public bool Dirty => _impl.Dirty;
|
|
||||||
|
|
||||||
internal CpuMultiRegionHandle(MultiRegionHandle impl)
|
|
||||||
{
|
|
||||||
_impl = impl;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Dispose() => _impl.Dispose();
|
|
||||||
public void ForceDirty(ulong address, ulong size) => _impl.ForceDirty(address, size);
|
|
||||||
public IEnumerable<IRegionHandle> GetHandles() => _impl.GetHandles();
|
|
||||||
public void QueryModified(Action<ulong, ulong> modifiedAction) => _impl.QueryModified(modifiedAction);
|
|
||||||
public void QueryModified(ulong address, ulong size, Action<ulong, ulong> modifiedAction) => _impl.QueryModified(address, size, modifiedAction);
|
|
||||||
public void QueryModified(ulong address, ulong size, Action<ulong, ulong> modifiedAction, int sequenceNumber) => _impl.QueryModified(address, size, modifiedAction, sequenceNumber);
|
|
||||||
public void RegisterAction(ulong address, ulong size, RegionSignal action) => _impl.RegisterAction(address, size, action);
|
|
||||||
public void RegisterPreciseAction(ulong address, ulong size, PreciseRegionSignal action) => _impl.RegisterPreciseAction(address, size, action);
|
|
||||||
public void SignalWrite() => _impl.SignalWrite();
|
|
||||||
}
|
|
||||||
}
|
|
@@ -1,37 +0,0 @@
|
|||||||
using Ryujinx.Memory.Tracking;
|
|
||||||
using System;
|
|
||||||
|
|
||||||
namespace Ryujinx.Cpu.Tracking
|
|
||||||
{
|
|
||||||
public class CpuRegionHandle : IRegionHandle
|
|
||||||
{
|
|
||||||
private readonly RegionHandle _impl;
|
|
||||||
|
|
||||||
public bool Dirty => _impl.Dirty;
|
|
||||||
public bool Unmapped => _impl.Unmapped;
|
|
||||||
public ulong Address => _impl.Address;
|
|
||||||
public ulong Size => _impl.Size;
|
|
||||||
public ulong EndAddress => _impl.EndAddress;
|
|
||||||
|
|
||||||
internal CpuRegionHandle(RegionHandle impl)
|
|
||||||
{
|
|
||||||
_impl = impl;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Dispose() => _impl.Dispose();
|
|
||||||
public bool DirtyOrVolatile() => _impl.DirtyOrVolatile();
|
|
||||||
public void ForceDirty() => _impl.ForceDirty();
|
|
||||||
public IRegionHandle GetHandle() => _impl;
|
|
||||||
public void RegisterAction(RegionSignal action) => _impl.RegisterAction(action);
|
|
||||||
public void RegisterPreciseAction(PreciseRegionSignal action) => _impl.RegisterPreciseAction(action);
|
|
||||||
public void RegisterDirtyEvent(Action action) => _impl.RegisterDirtyEvent(action);
|
|
||||||
public void Reprotect(bool asDirty = false) => _impl.Reprotect(asDirty);
|
|
||||||
|
|
||||||
public bool OverlapsWith(ulong address, ulong size) => _impl.OverlapsWith(address, size);
|
|
||||||
|
|
||||||
public bool RangeEquals(CpuRegionHandle other)
|
|
||||||
{
|
|
||||||
return _impl.RealAddress == other._impl.RealAddress && _impl.RealSize == other._impl.RealSize;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@@ -1,26 +0,0 @@
|
|||||||
using Ryujinx.Memory.Tracking;
|
|
||||||
using System;
|
|
||||||
|
|
||||||
namespace Ryujinx.Cpu.Tracking
|
|
||||||
{
|
|
||||||
public class CpuSmartMultiRegionHandle : IMultiRegionHandle
|
|
||||||
{
|
|
||||||
private readonly SmartMultiRegionHandle _impl;
|
|
||||||
|
|
||||||
public bool Dirty => _impl.Dirty;
|
|
||||||
|
|
||||||
internal CpuSmartMultiRegionHandle(SmartMultiRegionHandle impl)
|
|
||||||
{
|
|
||||||
_impl = impl;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Dispose() => _impl.Dispose();
|
|
||||||
public void ForceDirty(ulong address, ulong size) => _impl.ForceDirty(address, size);
|
|
||||||
public void RegisterAction(RegionSignal action) => _impl.RegisterAction(action);
|
|
||||||
public void RegisterPreciseAction(PreciseRegionSignal action) => _impl.RegisterPreciseAction(action);
|
|
||||||
public void QueryModified(Action<ulong, ulong> modifiedAction) => _impl.QueryModified(modifiedAction);
|
|
||||||
public void QueryModified(ulong address, ulong size, Action<ulong, ulong> modifiedAction) => _impl.QueryModified(address, size, modifiedAction);
|
|
||||||
public void QueryModified(ulong address, ulong size, Action<ulong, ulong> modifiedAction, int sequenceNumber) => _impl.QueryModified(address, size, modifiedAction, sequenceNumber);
|
|
||||||
public void SignalWrite() => _impl.SignalWrite();
|
|
||||||
}
|
|
||||||
}
|
|
@@ -157,11 +157,8 @@ namespace Ryujinx.Graphics.Gpu.Engine.Compute
|
|||||||
{
|
{
|
||||||
BufferDescriptor sb = info.SBuffers[index];
|
BufferDescriptor sb = info.SBuffers[index];
|
||||||
|
|
||||||
ulong sbDescAddress = _channel.BufferManager.GetComputeUniformBufferAddress(0);
|
ulong sbDescAddress = _channel.BufferManager.GetComputeUniformBufferAddress(sb.SbCbSlot);
|
||||||
|
sbDescAddress += (ulong)sb.SbCbOffset * 4;
|
||||||
int sbDescOffset = 0x310 + sb.Slot * 0x10;
|
|
||||||
|
|
||||||
sbDescAddress += (ulong)sbDescOffset;
|
|
||||||
|
|
||||||
SbDescriptor sbDescriptor = _channel.MemoryManager.Physical.Read<SbDescriptor>(sbDescAddress);
|
SbDescriptor sbDescriptor = _channel.MemoryManager.Physical.Read<SbDescriptor>(sbDescAddress);
|
||||||
|
|
||||||
|
@@ -351,11 +351,8 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
|
|||||||
{
|
{
|
||||||
BufferDescriptor sb = info.SBuffers[index];
|
BufferDescriptor sb = info.SBuffers[index];
|
||||||
|
|
||||||
ulong sbDescAddress = _channel.BufferManager.GetGraphicsUniformBufferAddress(stage, 0);
|
ulong sbDescAddress = _channel.BufferManager.GetGraphicsUniformBufferAddress(stage, sb.SbCbSlot);
|
||||||
|
sbDescAddress += (ulong)sb.SbCbOffset * 4;
|
||||||
int sbDescOffset = 0x110 + stage * 0x100 + sb.Slot * 0x10;
|
|
||||||
|
|
||||||
sbDescAddress += (ulong)sbDescOffset;
|
|
||||||
|
|
||||||
SbDescriptor sbDescriptor = _channel.MemoryManager.Physical.Read<SbDescriptor>(sbDescAddress);
|
SbDescriptor sbDescriptor = _channel.MemoryManager.Physical.Read<SbDescriptor>(sbDescAddress);
|
||||||
|
|
||||||
|
@@ -300,11 +300,16 @@ namespace Ryujinx.Graphics.Gpu.Engine.Twod
|
|||||||
IsCopyRegionComplete(srcCopyTexture, srcCopyTextureFormat, srcX1, srcY1, srcX2, srcY2) &&
|
IsCopyRegionComplete(srcCopyTexture, srcCopyTextureFormat, srcX1, srcY1, srcX2, srcY2) &&
|
||||||
IsCopyRegionComplete(dstCopyTexture, dstCopyTextureFormat, dstX1, dstY1, dstX2, dstY2);
|
IsCopyRegionComplete(dstCopyTexture, dstCopyTextureFormat, dstX1, dstY1, dstX2, dstY2);
|
||||||
|
|
||||||
|
// We can only allow aliasing of color formats as depth if the source and destination textures
|
||||||
|
// are the same, as we can't blit between different depth formats.
|
||||||
|
bool srcDepthAlias = srcCopyTexture.Format == dstCopyTexture.Format;
|
||||||
|
|
||||||
var srcTexture = memoryManager.Physical.TextureCache.FindOrCreateTexture(
|
var srcTexture = memoryManager.Physical.TextureCache.FindOrCreateTexture(
|
||||||
memoryManager,
|
memoryManager,
|
||||||
srcCopyTexture,
|
srcCopyTexture,
|
||||||
offset,
|
offset,
|
||||||
srcCopyTextureFormat,
|
srcCopyTextureFormat,
|
||||||
|
srcDepthAlias,
|
||||||
!canDirectCopy,
|
!canDirectCopy,
|
||||||
false,
|
false,
|
||||||
srcHint);
|
srcHint);
|
||||||
@@ -325,6 +330,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Twod
|
|||||||
// When the source texture that was found has a depth format,
|
// When the source texture that was found has a depth format,
|
||||||
// we must enforce the target texture also has a depth format,
|
// we must enforce the target texture also has a depth format,
|
||||||
// as copies between depth and color formats are not allowed.
|
// as copies between depth and color formats are not allowed.
|
||||||
|
// For depth blit, the destination texture format should always match exactly.
|
||||||
|
|
||||||
if (srcTexture.Format.IsDepthOrStencil())
|
if (srcTexture.Format.IsDepthOrStencil())
|
||||||
{
|
{
|
||||||
@@ -340,7 +346,8 @@ namespace Ryujinx.Graphics.Gpu.Engine.Twod
|
|||||||
dstCopyTexture,
|
dstCopyTexture,
|
||||||
0,
|
0,
|
||||||
dstCopyTextureFormat,
|
dstCopyTextureFormat,
|
||||||
true,
|
depthAlias: false,
|
||||||
|
shouldCreate: true,
|
||||||
srcTexture.ScaleMode == TextureScaleMode.Scaled,
|
srcTexture.ScaleMode == TextureScaleMode.Scaled,
|
||||||
dstHint);
|
dstHint);
|
||||||
|
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
using Ryujinx.Cpu.Tracking;
|
|
||||||
using Ryujinx.Graphics.Gpu.Memory;
|
using Ryujinx.Graphics.Gpu.Memory;
|
||||||
|
using Ryujinx.Memory.Tracking;
|
||||||
using System;
|
using System;
|
||||||
using System.Runtime.InteropServices;
|
using System.Runtime.InteropServices;
|
||||||
|
|
||||||
@@ -40,7 +40,7 @@ namespace Ryujinx.Graphics.Gpu.Image
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public ulong Size { get; }
|
public ulong Size { get; }
|
||||||
|
|
||||||
private readonly CpuMultiRegionHandle _memoryTracking;
|
private readonly MultiRegionHandle _memoryTracking;
|
||||||
private readonly Action<ulong, ulong> _modifiedDelegate;
|
private readonly Action<ulong, ulong> _modifiedDelegate;
|
||||||
|
|
||||||
private int _modifiedSequenceOffset;
|
private int _modifiedSequenceOffset;
|
||||||
|
@@ -1118,7 +1118,7 @@ namespace Ryujinx.Graphics.Gpu.Image
|
|||||||
{
|
{
|
||||||
bool forSampler = (flags & TextureSearchFlags.ForSampler) != 0;
|
bool forSampler = (flags & TextureSearchFlags.ForSampler) != 0;
|
||||||
|
|
||||||
TextureMatchQuality matchQuality = TextureCompatibility.FormatMatches(Info, info, forSampler, (flags & TextureSearchFlags.ForCopy) != 0);
|
TextureMatchQuality matchQuality = TextureCompatibility.FormatMatches(Info, info, forSampler, (flags & TextureSearchFlags.DepthAlias) != 0);
|
||||||
|
|
||||||
if (matchQuality == TextureMatchQuality.NoMatch)
|
if (matchQuality == TextureMatchQuality.NoMatch)
|
||||||
{
|
{
|
||||||
|
@@ -537,7 +537,7 @@ namespace Ryujinx.Graphics.Gpu.Image
|
|||||||
if (hostTexture != null && texture.Target == Target.TextureBuffer)
|
if (hostTexture != null && texture.Target == Target.TextureBuffer)
|
||||||
{
|
{
|
||||||
// Ensure that the buffer texture is using the correct buffer as storage.
|
// Ensure that the buffer texture is using the correct buffer as storage.
|
||||||
// Buffers are frequently re-created to accomodate larger data, so we need to re-bind
|
// Buffers are frequently re-created to accommodate larger data, so we need to re-bind
|
||||||
// to ensure we're not using a old buffer that was already deleted.
|
// to ensure we're not using a old buffer that was already deleted.
|
||||||
_channel.BufferManager.SetBufferTextureStorage(stage, hostTexture, texture.Range.GetSubRange(0).Address, texture.Size, bindingInfo, bindingInfo.Format, false);
|
_channel.BufferManager.SetBufferTextureStorage(stage, hostTexture, texture.Range.GetSubRange(0).Address, texture.Size, bindingInfo, bindingInfo.Format, false);
|
||||||
|
|
||||||
@@ -666,7 +666,7 @@ namespace Ryujinx.Graphics.Gpu.Image
|
|||||||
if (hostTexture != null && texture.Target == Target.TextureBuffer)
|
if (hostTexture != null && texture.Target == Target.TextureBuffer)
|
||||||
{
|
{
|
||||||
// Ensure that the buffer texture is using the correct buffer as storage.
|
// Ensure that the buffer texture is using the correct buffer as storage.
|
||||||
// Buffers are frequently re-created to accomodate larger data, so we need to re-bind
|
// Buffers are frequently re-created to accommodate larger data, so we need to re-bind
|
||||||
// to ensure we're not using a old buffer that was already deleted.
|
// to ensure we're not using a old buffer that was already deleted.
|
||||||
|
|
||||||
Format format = bindingInfo.Format;
|
Format format = bindingInfo.Format;
|
||||||
|
@@ -249,6 +249,8 @@ namespace Ryujinx.Graphics.Gpu.Image
|
|||||||
/// <param name="copyTexture">Copy texture to find or create</param>
|
/// <param name="copyTexture">Copy texture to find or create</param>
|
||||||
/// <param name="offset">Offset to be added to the physical texture address</param>
|
/// <param name="offset">Offset to be added to the physical texture address</param>
|
||||||
/// <param name="formatInfo">Format information of the copy texture</param>
|
/// <param name="formatInfo">Format information of the copy texture</param>
|
||||||
|
/// <param name="depthAlias">Indicates if aliasing between color and depth format should be allowed</param>
|
||||||
|
/// <param name="shouldCreate">Indicates if a new texture should be created if none is found on the cache</param>
|
||||||
/// <param name="preferScaling">Indicates if the texture should be scaled from the start</param>
|
/// <param name="preferScaling">Indicates if the texture should be scaled from the start</param>
|
||||||
/// <param name="sizeHint">A hint indicating the minimum used size for the texture</param>
|
/// <param name="sizeHint">A hint indicating the minimum used size for the texture</param>
|
||||||
/// <returns>The texture</returns>
|
/// <returns>The texture</returns>
|
||||||
@@ -257,6 +259,7 @@ namespace Ryujinx.Graphics.Gpu.Image
|
|||||||
TwodTexture copyTexture,
|
TwodTexture copyTexture,
|
||||||
ulong offset,
|
ulong offset,
|
||||||
FormatInfo formatInfo,
|
FormatInfo formatInfo,
|
||||||
|
bool depthAlias,
|
||||||
bool shouldCreate,
|
bool shouldCreate,
|
||||||
bool preferScaling,
|
bool preferScaling,
|
||||||
Size sizeHint)
|
Size sizeHint)
|
||||||
@@ -293,6 +296,11 @@ namespace Ryujinx.Graphics.Gpu.Image
|
|||||||
|
|
||||||
TextureSearchFlags flags = TextureSearchFlags.ForCopy;
|
TextureSearchFlags flags = TextureSearchFlags.ForCopy;
|
||||||
|
|
||||||
|
if (depthAlias)
|
||||||
|
{
|
||||||
|
flags |= TextureSearchFlags.DepthAlias;
|
||||||
|
}
|
||||||
|
|
||||||
if (preferScaling)
|
if (preferScaling)
|
||||||
{
|
{
|
||||||
flags |= TextureSearchFlags.WithUpscale;
|
flags |= TextureSearchFlags.WithUpscale;
|
||||||
|
@@ -220,18 +220,18 @@ namespace Ryujinx.Graphics.Gpu.Image
|
|||||||
/// <param name="lhs">Texture information to compare</param>
|
/// <param name="lhs">Texture information to compare</param>
|
||||||
/// <param name="rhs">Texture information to compare with</param>
|
/// <param name="rhs">Texture information to compare with</param>
|
||||||
/// <param name="forSampler">Indicates that the texture will be used for shader sampling</param>
|
/// <param name="forSampler">Indicates that the texture will be used for shader sampling</param>
|
||||||
/// <param name="forCopy">Indicates that the texture will be used as copy source or target</param>
|
/// <param name="depthAlias">Indicates if aliasing between color and depth format should be allowed</param>
|
||||||
/// <returns>A value indicating how well the formats match</returns>
|
/// <returns>A value indicating how well the formats match</returns>
|
||||||
public static TextureMatchQuality FormatMatches(TextureInfo lhs, TextureInfo rhs, bool forSampler, bool forCopy)
|
public static TextureMatchQuality FormatMatches(TextureInfo lhs, TextureInfo rhs, bool forSampler, bool depthAlias)
|
||||||
{
|
{
|
||||||
// D32F and R32F texture have the same representation internally,
|
// D32F and R32F texture have the same representation internally,
|
||||||
// however the R32F format is used to sample from depth textures.
|
// however the R32F format is used to sample from depth textures.
|
||||||
if (lhs.FormatInfo.Format == Format.D32Float && rhs.FormatInfo.Format == Format.R32Float && (forSampler || forCopy))
|
if (lhs.FormatInfo.Format == Format.D32Float && rhs.FormatInfo.Format == Format.R32Float && (forSampler || depthAlias))
|
||||||
{
|
{
|
||||||
return TextureMatchQuality.FormatAlias;
|
return TextureMatchQuality.FormatAlias;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (forCopy)
|
if (depthAlias)
|
||||||
{
|
{
|
||||||
// The 2D engine does not support depth-stencil formats, so it will instead
|
// The 2D engine does not support depth-stencil formats, so it will instead
|
||||||
// use equivalent color formats. We must also consider them as compatible.
|
// use equivalent color formats. We must also consider them as compatible.
|
||||||
|
@@ -1,10 +1,10 @@
|
|||||||
using Ryujinx.Common.Memory;
|
using Ryujinx.Common.Memory;
|
||||||
using Ryujinx.Cpu.Tracking;
|
|
||||||
using Ryujinx.Graphics.GAL;
|
using Ryujinx.Graphics.GAL;
|
||||||
using Ryujinx.Graphics.Gpu.Memory;
|
using Ryujinx.Graphics.Gpu.Memory;
|
||||||
using Ryujinx.Graphics.Texture;
|
using Ryujinx.Graphics.Texture;
|
||||||
using Ryujinx.Memory;
|
using Ryujinx.Memory;
|
||||||
using Ryujinx.Memory.Range;
|
using Ryujinx.Memory.Range;
|
||||||
|
using Ryujinx.Memory.Tracking;
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Runtime.CompilerServices;
|
using System.Runtime.CompilerServices;
|
||||||
@@ -255,7 +255,7 @@ namespace Ryujinx.Graphics.Gpu.Image
|
|||||||
{
|
{
|
||||||
TextureGroupHandle group = _handles[baseHandle + i];
|
TextureGroupHandle group = _handles[baseHandle + i];
|
||||||
|
|
||||||
foreach (CpuRegionHandle handle in group.Handles)
|
foreach (RegionHandle handle in group.Handles)
|
||||||
{
|
{
|
||||||
if (handle.Dirty)
|
if (handle.Dirty)
|
||||||
{
|
{
|
||||||
@@ -296,7 +296,7 @@ namespace Ryujinx.Graphics.Gpu.Image
|
|||||||
bool handleDirty = false;
|
bool handleDirty = false;
|
||||||
bool handleUnmapped = false;
|
bool handleUnmapped = false;
|
||||||
|
|
||||||
foreach (CpuRegionHandle handle in group.Handles)
|
foreach (RegionHandle handle in group.Handles)
|
||||||
{
|
{
|
||||||
if (handle.Dirty)
|
if (handle.Dirty)
|
||||||
{
|
{
|
||||||
@@ -703,7 +703,7 @@ namespace Ryujinx.Graphics.Gpu.Image
|
|||||||
/// <param name="group">The group to register an action for</param>
|
/// <param name="group">The group to register an action for</param>
|
||||||
public void RegisterAction(TextureGroupHandle group)
|
public void RegisterAction(TextureGroupHandle group)
|
||||||
{
|
{
|
||||||
foreach (CpuRegionHandle handle in group.Handles)
|
foreach (RegionHandle handle in group.Handles)
|
||||||
{
|
{
|
||||||
handle.RegisterAction((address, size) => FlushAction(group, address, size));
|
handle.RegisterAction((address, size) => FlushAction(group, address, size));
|
||||||
}
|
}
|
||||||
@@ -985,7 +985,7 @@ namespace Ryujinx.Graphics.Gpu.Image
|
|||||||
/// <param name="address">The start address of the tracked region</param>
|
/// <param name="address">The start address of the tracked region</param>
|
||||||
/// <param name="size">The size of the tracked region</param>
|
/// <param name="size">The size of the tracked region</param>
|
||||||
/// <returns>A CpuRegionHandle covering the given range</returns>
|
/// <returns>A CpuRegionHandle covering the given range</returns>
|
||||||
private CpuRegionHandle GenerateHandle(ulong address, ulong size)
|
private RegionHandle GenerateHandle(ulong address, ulong size)
|
||||||
{
|
{
|
||||||
return _physicalMemory.BeginTracking(address, size, ResourceKind.Texture);
|
return _physicalMemory.BeginTracking(address, size, ResourceKind.Texture);
|
||||||
}
|
}
|
||||||
@@ -1005,7 +1005,7 @@ namespace Ryujinx.Graphics.Gpu.Image
|
|||||||
int endOffset = _allOffsets[viewEnd] + _sliceSizes[lastLevel];
|
int endOffset = _allOffsets[viewEnd] + _sliceSizes[lastLevel];
|
||||||
int size = endOffset - offset;
|
int size = endOffset - offset;
|
||||||
|
|
||||||
var result = new List<CpuRegionHandle>();
|
var result = new List<RegionHandle>();
|
||||||
|
|
||||||
for (int i = 0; i < TextureRange.Count; i++)
|
for (int i = 0; i < TextureRange.Count; i++)
|
||||||
{
|
{
|
||||||
@@ -1050,7 +1050,7 @@ namespace Ryujinx.Graphics.Gpu.Image
|
|||||||
views,
|
views,
|
||||||
result.ToArray());
|
result.ToArray());
|
||||||
|
|
||||||
foreach (CpuRegionHandle handle in result)
|
foreach (RegionHandle handle in result)
|
||||||
{
|
{
|
||||||
handle.RegisterDirtyEvent(() => DirtyAction(groupHandle));
|
handle.RegisterDirtyEvent(() => DirtyAction(groupHandle));
|
||||||
}
|
}
|
||||||
@@ -1248,7 +1248,7 @@ namespace Ryujinx.Graphics.Gpu.Image
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
foreach (CpuRegionHandle handle in groupHandle.Handles)
|
foreach (RegionHandle handle in groupHandle.Handles)
|
||||||
{
|
{
|
||||||
bool hasMatch = false;
|
bool hasMatch = false;
|
||||||
|
|
||||||
@@ -1270,7 +1270,7 @@ namespace Ryujinx.Graphics.Gpu.Image
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
foreach (CpuRegionHandle handle in groupHandle.Handles)
|
foreach (RegionHandle handle in groupHandle.Handles)
|
||||||
{
|
{
|
||||||
handle.Reprotect();
|
handle.Reprotect();
|
||||||
}
|
}
|
||||||
@@ -1303,7 +1303,7 @@ namespace Ryujinx.Graphics.Gpu.Image
|
|||||||
if (!(_hasMipViews || _hasLayerViews))
|
if (!(_hasMipViews || _hasLayerViews))
|
||||||
{
|
{
|
||||||
// Single dirty region.
|
// Single dirty region.
|
||||||
var cpuRegionHandles = new CpuRegionHandle[TextureRange.Count];
|
var cpuRegionHandles = new RegionHandle[TextureRange.Count];
|
||||||
int count = 0;
|
int count = 0;
|
||||||
|
|
||||||
for (int i = 0; i < TextureRange.Count; i++)
|
for (int i = 0; i < TextureRange.Count; i++)
|
||||||
@@ -1322,7 +1322,7 @@ namespace Ryujinx.Graphics.Gpu.Image
|
|||||||
|
|
||||||
var groupHandle = new TextureGroupHandle(this, 0, Storage.Size, _views, 0, 0, 0, _allOffsets.Length, cpuRegionHandles);
|
var groupHandle = new TextureGroupHandle(this, 0, Storage.Size, _views, 0, 0, 0, _allOffsets.Length, cpuRegionHandles);
|
||||||
|
|
||||||
foreach (CpuRegionHandle handle in cpuRegionHandles)
|
foreach (RegionHandle handle in cpuRegionHandles)
|
||||||
{
|
{
|
||||||
handle.RegisterDirtyEvent(() => DirtyAction(groupHandle));
|
handle.RegisterDirtyEvent(() => DirtyAction(groupHandle));
|
||||||
}
|
}
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
using Ryujinx.Cpu.Tracking;
|
using Ryujinx.Graphics.Gpu.Synchronization;
|
||||||
using Ryujinx.Graphics.Gpu.Synchronization;
|
using Ryujinx.Memory.Tracking;
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
@@ -85,7 +85,7 @@ namespace Ryujinx.Graphics.Gpu.Image
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// The CPU memory tracking handles that cover this handle.
|
/// The CPU memory tracking handles that cover this handle.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public CpuRegionHandle[] Handles { get; }
|
public RegionHandle[] Handles { get; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// True if a texture overlapping this handle has been modified. Is set false when the flush action is called.
|
/// True if a texture overlapping this handle has been modified. Is set false when the flush action is called.
|
||||||
@@ -127,7 +127,7 @@ namespace Ryujinx.Graphics.Gpu.Image
|
|||||||
int firstLevel,
|
int firstLevel,
|
||||||
int baseSlice,
|
int baseSlice,
|
||||||
int sliceCount,
|
int sliceCount,
|
||||||
CpuRegionHandle[] handles)
|
RegionHandle[] handles)
|
||||||
{
|
{
|
||||||
_group = group;
|
_group = group;
|
||||||
_firstLayer = firstLayer;
|
_firstLayer = firstLayer;
|
||||||
@@ -642,7 +642,7 @@ namespace Ryujinx.Graphics.Gpu.Image
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public void Dispose()
|
public void Dispose()
|
||||||
{
|
{
|
||||||
foreach (CpuRegionHandle handle in Handles)
|
foreach (RegionHandle handle in Handles)
|
||||||
{
|
{
|
||||||
handle.Dispose();
|
handle.Dispose();
|
||||||
}
|
}
|
||||||
|
@@ -11,7 +11,8 @@ namespace Ryujinx.Graphics.Gpu.Image
|
|||||||
None = 0,
|
None = 0,
|
||||||
ForSampler = 1 << 1,
|
ForSampler = 1 << 1,
|
||||||
ForCopy = 1 << 2,
|
ForCopy = 1 << 2,
|
||||||
WithUpscale = 1 << 3,
|
DepthAlias = 1 << 3,
|
||||||
NoCreate = 1 << 4
|
WithUpscale = 1 << 4,
|
||||||
|
NoCreate = 1 << 5
|
||||||
}
|
}
|
||||||
}
|
}
|
@@ -1,4 +1,3 @@
|
|||||||
using Ryujinx.Cpu.Tracking;
|
|
||||||
using Ryujinx.Graphics.GAL;
|
using Ryujinx.Graphics.GAL;
|
||||||
using Ryujinx.Graphics.Gpu.Synchronization;
|
using Ryujinx.Graphics.Gpu.Synchronization;
|
||||||
using Ryujinx.Memory.Range;
|
using Ryujinx.Memory.Range;
|
||||||
@@ -54,8 +53,8 @@ namespace Ryujinx.Graphics.Gpu.Memory
|
|||||||
/// </remarks>
|
/// </remarks>
|
||||||
private BufferModifiedRangeList _modifiedRanges = null;
|
private BufferModifiedRangeList _modifiedRanges = null;
|
||||||
|
|
||||||
private readonly CpuMultiRegionHandle _memoryTrackingGranular;
|
private readonly MultiRegionHandle _memoryTrackingGranular;
|
||||||
private readonly CpuRegionHandle _memoryTracking;
|
private readonly RegionHandle _memoryTracking;
|
||||||
|
|
||||||
private readonly RegionSignal _externalFlushDelegate;
|
private readonly RegionSignal _externalFlushDelegate;
|
||||||
private readonly Action<ulong, ulong> _loadDelegate;
|
private readonly Action<ulong, ulong> _loadDelegate;
|
||||||
@@ -68,6 +67,9 @@ namespace Ryujinx.Graphics.Gpu.Memory
|
|||||||
|
|
||||||
private int _referenceCount = 1;
|
private int _referenceCount = 1;
|
||||||
|
|
||||||
|
private ulong _dirtyStart = ulong.MaxValue;
|
||||||
|
private ulong _dirtyEnd = ulong.MaxValue;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Creates a new instance of the buffer.
|
/// Creates a new instance of the buffer.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -99,7 +101,7 @@ namespace Ryujinx.Graphics.Gpu.Memory
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
return Enumerable.Repeat(buffer._memoryTracking.GetHandle(), 1);
|
return Enumerable.Repeat(buffer._memoryTracking, 1);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -221,6 +223,26 @@ namespace Ryujinx.Graphics.Gpu.Memory
|
|||||||
}
|
}
|
||||||
|
|
||||||
_sequenceNumber = _context.SequenceNumber;
|
_sequenceNumber = _context.SequenceNumber;
|
||||||
|
_dirtyStart = ulong.MaxValue;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (_dirtyStart != ulong.MaxValue)
|
||||||
|
{
|
||||||
|
ulong end = address + size;
|
||||||
|
|
||||||
|
if (end > _dirtyStart && address < _dirtyEnd)
|
||||||
|
{
|
||||||
|
if (_modifiedRanges != null)
|
||||||
|
{
|
||||||
|
_modifiedRanges.ExcludeModifiedRegions(_dirtyStart, _dirtyEnd - _dirtyStart, _loadDelegate);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
LoadRegion(_dirtyStart, _dirtyEnd - _dirtyStart);
|
||||||
|
}
|
||||||
|
|
||||||
|
_dirtyStart = ulong.MaxValue;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -291,7 +313,7 @@ namespace Ryujinx.Graphics.Gpu.Memory
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Inherit modified ranges from another buffer.
|
/// Inherit modified and dirty ranges from another buffer.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="from">The buffer to inherit from</param>
|
/// <param name="from">The buffer to inherit from</param>
|
||||||
public void InheritModifiedRanges(Buffer from)
|
public void InheritModifiedRanges(Buffer from)
|
||||||
@@ -320,6 +342,11 @@ namespace Ryujinx.Graphics.Gpu.Memory
|
|||||||
|
|
||||||
_modifiedRanges.InheritRanges(from._modifiedRanges, registerRangeAction);
|
_modifiedRanges.InheritRanges(from._modifiedRanges, registerRangeAction);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (from._dirtyStart != ulong.MaxValue)
|
||||||
|
{
|
||||||
|
ForceDirty(from._dirtyStart, from._dirtyEnd - from._dirtyStart);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -338,6 +365,44 @@ namespace Ryujinx.Graphics.Gpu.Memory
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Clear the dirty range that overlaps with the given region.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="address">Start address of the modified region</param>
|
||||||
|
/// <param name="size">Size of the modified region</param>
|
||||||
|
private void ClearDirty(ulong address, ulong size)
|
||||||
|
{
|
||||||
|
if (_dirtyStart != ulong.MaxValue)
|
||||||
|
{
|
||||||
|
ulong end = address + size;
|
||||||
|
|
||||||
|
if (end > _dirtyStart && address < _dirtyEnd)
|
||||||
|
{
|
||||||
|
if (address <= _dirtyStart)
|
||||||
|
{
|
||||||
|
// Cut off the start.
|
||||||
|
|
||||||
|
if (end < _dirtyEnd)
|
||||||
|
{
|
||||||
|
_dirtyStart = end;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
_dirtyStart = ulong.MaxValue;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if (end >= _dirtyEnd)
|
||||||
|
{
|
||||||
|
// Cut off the end.
|
||||||
|
|
||||||
|
_dirtyEnd = address;
|
||||||
|
}
|
||||||
|
|
||||||
|
// If fully contained, do nothing.
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Indicate that a region of the buffer was modified, and must be loaded from memory.
|
/// Indicate that a region of the buffer was modified, and must be loaded from memory.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -357,6 +422,8 @@ namespace Ryujinx.Graphics.Gpu.Memory
|
|||||||
mSize = maxSize;
|
mSize = maxSize;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ClearDirty(mAddress, mSize);
|
||||||
|
|
||||||
if (_modifiedRanges != null)
|
if (_modifiedRanges != null)
|
||||||
{
|
{
|
||||||
_modifiedRanges.ExcludeModifiedRegions(mAddress, mSize, _loadDelegate);
|
_modifiedRanges.ExcludeModifiedRegions(mAddress, mSize, _loadDelegate);
|
||||||
@@ -380,14 +447,12 @@ namespace Ryujinx.Graphics.Gpu.Memory
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Force a region of the buffer to be dirty. Avoids reprotection and nullifies sequence number check.
|
/// Force a region of the buffer to be dirty within the memory tracking. Avoids reprotection and nullifies sequence number check.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="mAddress">Start address of the modified region</param>
|
/// <param name="mAddress">Start address of the modified region</param>
|
||||||
/// <param name="mSize">Size of the region to force dirty</param>
|
/// <param name="mSize">Size of the region to force dirty</param>
|
||||||
public void ForceDirty(ulong mAddress, ulong mSize)
|
private void ForceTrackingDirty(ulong mAddress, ulong mSize)
|
||||||
{
|
{
|
||||||
_modifiedRanges?.Clear(mAddress, mSize);
|
|
||||||
|
|
||||||
if (_useGranular)
|
if (_useGranular)
|
||||||
{
|
{
|
||||||
_memoryTrackingGranular.ForceDirty(mAddress, mSize);
|
_memoryTrackingGranular.ForceDirty(mAddress, mSize);
|
||||||
@@ -399,6 +464,39 @@ namespace Ryujinx.Graphics.Gpu.Memory
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Force a region of the buffer to be dirty. Avoids reprotection and nullifies sequence number check.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="mAddress">Start address of the modified region</param>
|
||||||
|
/// <param name="mSize">Size of the region to force dirty</param>
|
||||||
|
public void ForceDirty(ulong mAddress, ulong mSize)
|
||||||
|
{
|
||||||
|
_modifiedRanges?.Clear(mAddress, mSize);
|
||||||
|
|
||||||
|
ulong end = mAddress + mSize;
|
||||||
|
|
||||||
|
if (_dirtyStart == ulong.MaxValue)
|
||||||
|
{
|
||||||
|
_dirtyStart = mAddress;
|
||||||
|
_dirtyEnd = end;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// Is the new range more than a page away from the existing one?
|
||||||
|
|
||||||
|
if ((long)(mAddress - _dirtyEnd) >= (long)MemoryManager.PageSize ||
|
||||||
|
(long)(_dirtyStart - end) >= (long)MemoryManager.PageSize)
|
||||||
|
{
|
||||||
|
ForceTrackingDirty(mAddress, mSize);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
_dirtyStart = Math.Min(_dirtyStart, mAddress);
|
||||||
|
_dirtyEnd = Math.Max(_dirtyEnd, end);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Performs copy of all the buffer data from one buffer to another.
|
/// Performs copy of all the buffer data from one buffer to another.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
@@ -1,5 +1,4 @@
|
|||||||
using Ryujinx.Cpu.Tracking;
|
using Ryujinx.Memory.Tracking;
|
||||||
using Ryujinx.Memory.Tracking;
|
|
||||||
using System;
|
using System;
|
||||||
|
|
||||||
namespace Ryujinx.Graphics.Gpu.Memory
|
namespace Ryujinx.Graphics.Gpu.Memory
|
||||||
@@ -9,7 +8,7 @@ namespace Ryujinx.Graphics.Gpu.Memory
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
class GpuRegionHandle : IRegionHandle
|
class GpuRegionHandle : IRegionHandle
|
||||||
{
|
{
|
||||||
private readonly CpuRegionHandle[] _cpuRegionHandles;
|
private readonly RegionHandle[] _cpuRegionHandles;
|
||||||
|
|
||||||
public bool Dirty
|
public bool Dirty
|
||||||
{
|
{
|
||||||
@@ -35,7 +34,7 @@ namespace Ryujinx.Graphics.Gpu.Memory
|
|||||||
/// Create a new GpuRegionHandle, made up of mulitple CpuRegionHandles.
|
/// Create a new GpuRegionHandle, made up of mulitple CpuRegionHandles.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="cpuRegionHandles">The CpuRegionHandles that make up this handle</param>
|
/// <param name="cpuRegionHandles">The CpuRegionHandles that make up this handle</param>
|
||||||
public GpuRegionHandle(CpuRegionHandle[] cpuRegionHandles)
|
public GpuRegionHandle(RegionHandle[] cpuRegionHandles)
|
||||||
{
|
{
|
||||||
_cpuRegionHandles = cpuRegionHandles;
|
_cpuRegionHandles = cpuRegionHandles;
|
||||||
}
|
}
|
||||||
|
@@ -1,5 +1,4 @@
|
|||||||
using Ryujinx.Cpu;
|
using Ryujinx.Cpu;
|
||||||
using Ryujinx.Cpu.Tracking;
|
|
||||||
using Ryujinx.Graphics.Gpu.Image;
|
using Ryujinx.Graphics.Gpu.Image;
|
||||||
using Ryujinx.Graphics.Gpu.Shader;
|
using Ryujinx.Graphics.Gpu.Shader;
|
||||||
using Ryujinx.Memory;
|
using Ryujinx.Memory;
|
||||||
@@ -348,7 +347,7 @@ namespace Ryujinx.Graphics.Gpu.Memory
|
|||||||
/// <param name="size">Size of the region</param>
|
/// <param name="size">Size of the region</param>
|
||||||
/// <param name="kind">Kind of the resource being tracked</param>
|
/// <param name="kind">Kind of the resource being tracked</param>
|
||||||
/// <returns>The memory tracking handle</returns>
|
/// <returns>The memory tracking handle</returns>
|
||||||
public CpuRegionHandle BeginTracking(ulong address, ulong size, ResourceKind kind)
|
public RegionHandle BeginTracking(ulong address, ulong size, ResourceKind kind)
|
||||||
{
|
{
|
||||||
return _cpuMemory.BeginTracking(address, size, (int)kind);
|
return _cpuMemory.BeginTracking(address, size, (int)kind);
|
||||||
}
|
}
|
||||||
@@ -361,7 +360,7 @@ namespace Ryujinx.Graphics.Gpu.Memory
|
|||||||
/// <returns>The memory tracking handle</returns>
|
/// <returns>The memory tracking handle</returns>
|
||||||
public GpuRegionHandle BeginTracking(MultiRange range, ResourceKind kind)
|
public GpuRegionHandle BeginTracking(MultiRange range, ResourceKind kind)
|
||||||
{
|
{
|
||||||
var cpuRegionHandles = new CpuRegionHandle[range.Count];
|
var cpuRegionHandles = new RegionHandle[range.Count];
|
||||||
int count = 0;
|
int count = 0;
|
||||||
|
|
||||||
for (int i = 0; i < range.Count; i++)
|
for (int i = 0; i < range.Count; i++)
|
||||||
@@ -390,7 +389,7 @@ namespace Ryujinx.Graphics.Gpu.Memory
|
|||||||
/// <param name="handles">Handles to inherit state from or reuse</param>
|
/// <param name="handles">Handles to inherit state from or reuse</param>
|
||||||
/// <param name="granularity">Desired granularity of write tracking</param>
|
/// <param name="granularity">Desired granularity of write tracking</param>
|
||||||
/// <returns>The memory tracking handle</returns>
|
/// <returns>The memory tracking handle</returns>
|
||||||
public CpuMultiRegionHandle BeginGranularTracking(ulong address, ulong size, ResourceKind kind, IEnumerable<IRegionHandle> handles = null, ulong granularity = 4096)
|
public MultiRegionHandle BeginGranularTracking(ulong address, ulong size, ResourceKind kind, IEnumerable<IRegionHandle> handles = null, ulong granularity = 4096)
|
||||||
{
|
{
|
||||||
return _cpuMemory.BeginGranularTracking(address, size, handles, granularity, (int)kind);
|
return _cpuMemory.BeginGranularTracking(address, size, handles, granularity, (int)kind);
|
||||||
}
|
}
|
||||||
@@ -403,7 +402,7 @@ namespace Ryujinx.Graphics.Gpu.Memory
|
|||||||
/// <param name="kind">Kind of the resource being tracked</param>
|
/// <param name="kind">Kind of the resource being tracked</param>
|
||||||
/// <param name="granularity">Desired granularity of write tracking</param>
|
/// <param name="granularity">Desired granularity of write tracking</param>
|
||||||
/// <returns>The memory tracking handle</returns>
|
/// <returns>The memory tracking handle</returns>
|
||||||
public CpuSmartMultiRegionHandle BeginSmartGranularTracking(ulong address, ulong size, ResourceKind kind, ulong granularity = 4096)
|
public SmartMultiRegionHandle BeginSmartGranularTracking(ulong address, ulong size, ResourceKind kind, ulong granularity = 4096)
|
||||||
{
|
{
|
||||||
return _cpuMemory.BeginSmartGranularTracking(address, size, granularity, (int)kind);
|
return _cpuMemory.BeginSmartGranularTracking(address, size, granularity, (int)kind);
|
||||||
}
|
}
|
||||||
|
@@ -22,7 +22,7 @@ namespace Ryujinx.Graphics.Gpu.Shader.DiskCache
|
|||||||
private const ushort FileFormatVersionMajor = 1;
|
private const ushort FileFormatVersionMajor = 1;
|
||||||
private const ushort FileFormatVersionMinor = 2;
|
private const ushort FileFormatVersionMinor = 2;
|
||||||
private const uint FileFormatVersionPacked = ((uint)FileFormatVersionMajor << 16) | FileFormatVersionMinor;
|
private const uint FileFormatVersionPacked = ((uint)FileFormatVersionMajor << 16) | FileFormatVersionMinor;
|
||||||
private const uint CodeGenVersion = 4735;
|
private const uint CodeGenVersion = 4821;
|
||||||
|
|
||||||
private const string SharedTocFileName = "shared.toc";
|
private const string SharedTocFileName = "shared.toc";
|
||||||
private const string SharedDataFileName = "shared.data";
|
private const string SharedDataFileName = "shared.data";
|
||||||
|
@@ -299,10 +299,13 @@ namespace Ryujinx.Graphics.Gpu.Shader.DiskCache
|
|||||||
|
|
||||||
if (_programList.Count != 0)
|
if (_programList.Count != 0)
|
||||||
{
|
{
|
||||||
|
_stateChangeCallback(ShaderCacheState.Packaging, 0, _programList.Count);
|
||||||
|
|
||||||
Logger.Info?.Print(LogClass.Gpu, $"Rebuilding {_programList.Count} shaders...");
|
Logger.Info?.Print(LogClass.Gpu, $"Rebuilding {_programList.Count} shaders...");
|
||||||
|
|
||||||
using var streams = _hostStorage.GetOutputStreams(_context);
|
using var streams = _hostStorage.GetOutputStreams(_context);
|
||||||
|
|
||||||
|
int packagedShaders = 0;
|
||||||
foreach (var kv in _programList)
|
foreach (var kv in _programList)
|
||||||
{
|
{
|
||||||
if (!Active)
|
if (!Active)
|
||||||
@@ -311,7 +314,10 @@ namespace Ryujinx.Graphics.Gpu.Shader.DiskCache
|
|||||||
}
|
}
|
||||||
|
|
||||||
(CachedShaderProgram program, byte[] binaryCode) = kv.Value;
|
(CachedShaderProgram program, byte[] binaryCode) = kv.Value;
|
||||||
|
|
||||||
_hostStorage.AddShader(_context, program, binaryCode, streams);
|
_hostStorage.AddShader(_context, program, binaryCode, streams);
|
||||||
|
|
||||||
|
_stateChangeCallback(ShaderCacheState.Packaging, ++packagedShaders, _programList.Count);
|
||||||
}
|
}
|
||||||
|
|
||||||
Logger.Info?.Print(LogClass.Gpu, $"Rebuilt {_programList.Count} shaders successfully.");
|
Logger.Info?.Print(LogClass.Gpu, $"Rebuilt {_programList.Count} shaders successfully.");
|
||||||
|
@@ -7,6 +7,8 @@ namespace Ryujinx.Graphics.Gpu.Shader
|
|||||||
Start,
|
Start,
|
||||||
/// <summary>Shader cache is loading</summary>
|
/// <summary>Shader cache is loading</summary>
|
||||||
Loading,
|
Loading,
|
||||||
|
/// <summary>Shader cache is written to disk</summary>
|
||||||
|
Packaging,
|
||||||
/// <summary>Shader cache finished loading</summary>
|
/// <summary>Shader cache finished loading</summary>
|
||||||
Loaded
|
Loaded
|
||||||
}
|
}
|
||||||
|
@@ -104,7 +104,7 @@ namespace Ryujinx.Graphics.OpenGL
|
|||||||
|
|
||||||
private static GpuVendor GetGpuVendor()
|
private static GpuVendor GetGpuVendor()
|
||||||
{
|
{
|
||||||
string vendor = GL.GetString(StringName.Vendor).ToLower();
|
string vendor = GL.GetString(StringName.Vendor).ToLowerInvariant();
|
||||||
|
|
||||||
if (vendor == "nvidia corporation")
|
if (vendor == "nvidia corporation")
|
||||||
{
|
{
|
||||||
@@ -112,7 +112,7 @@ namespace Ryujinx.Graphics.OpenGL
|
|||||||
}
|
}
|
||||||
else if (vendor == "intel")
|
else if (vendor == "intel")
|
||||||
{
|
{
|
||||||
string renderer = GL.GetString(StringName.Renderer).ToLower();
|
string renderer = GL.GetString(StringName.Renderer).ToLowerInvariant();
|
||||||
|
|
||||||
return renderer.Contains("mesa") ? GpuVendor.IntelUnix : GpuVendor.IntelWindows;
|
return renderer.Contains("mesa") ? GpuVendor.IntelUnix : GpuVendor.IntelWindows;
|
||||||
}
|
}
|
||||||
|
@@ -5,13 +5,27 @@ namespace Ryujinx.Graphics.Shader
|
|||||||
// New fields should be added to the end of the struct to keep disk shader cache compatibility.
|
// New fields should be added to the end of the struct to keep disk shader cache compatibility.
|
||||||
|
|
||||||
public readonly int Binding;
|
public readonly int Binding;
|
||||||
public readonly int Slot;
|
public readonly byte Slot;
|
||||||
|
public readonly byte SbCbSlot;
|
||||||
|
public readonly ushort SbCbOffset;
|
||||||
public BufferUsageFlags Flags;
|
public BufferUsageFlags Flags;
|
||||||
|
|
||||||
public BufferDescriptor(int binding, int slot)
|
public BufferDescriptor(int binding, int slot)
|
||||||
{
|
{
|
||||||
Binding = binding;
|
Binding = binding;
|
||||||
Slot = slot;
|
Slot = (byte)slot;
|
||||||
|
SbCbSlot = 0;
|
||||||
|
SbCbOffset = 0;
|
||||||
|
|
||||||
|
Flags = BufferUsageFlags.None;
|
||||||
|
}
|
||||||
|
|
||||||
|
public BufferDescriptor(int binding, int slot, int sbCbSlot, int sbCbOffset)
|
||||||
|
{
|
||||||
|
Binding = binding;
|
||||||
|
Slot = (byte)slot;
|
||||||
|
SbCbSlot = (byte)sbCbSlot;
|
||||||
|
SbCbOffset = (ushort)sbCbOffset;
|
||||||
|
|
||||||
Flags = BufferUsageFlags.None;
|
Flags = BufferUsageFlags.None;
|
||||||
}
|
}
|
||||||
|
@@ -6,7 +6,7 @@ namespace Ryujinx.Graphics.Shader
|
|||||||
/// Flags that indicate how a buffer will be used in a shader.
|
/// Flags that indicate how a buffer will be used in a shader.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
[Flags]
|
[Flags]
|
||||||
public enum BufferUsageFlags
|
public enum BufferUsageFlags : byte
|
||||||
{
|
{
|
||||||
None = 0,
|
None = 0,
|
||||||
|
|
||||||
|
@@ -16,6 +16,8 @@ namespace Ryujinx.Graphics.Shader.Translation
|
|||||||
public const int UbeDescsSize = StorageDescSize * UbeMaxCount;
|
public const int UbeDescsSize = StorageDescSize * UbeMaxCount;
|
||||||
public const int UbeFirstCbuf = 8;
|
public const int UbeFirstCbuf = 8;
|
||||||
|
|
||||||
|
public const int DriverReservedCb = 0;
|
||||||
|
|
||||||
public static bool UsesGlobalMemory(Instruction inst, StorageKind storageKind)
|
public static bool UsesGlobalMemory(Instruction inst, StorageKind storageKind)
|
||||||
{
|
{
|
||||||
return (inst.IsAtomic() && storageKind == StorageKind.GlobalMemory) ||
|
return (inst.IsAtomic() && storageKind == StorageKind.GlobalMemory) ||
|
||||||
|
@@ -8,6 +8,20 @@ namespace Ryujinx.Graphics.Shader.Translation.Optimizations
|
|||||||
{
|
{
|
||||||
static class GlobalToStorage
|
static class GlobalToStorage
|
||||||
{
|
{
|
||||||
|
private struct SearchResult
|
||||||
|
{
|
||||||
|
public static SearchResult NotFound => new SearchResult(-1, 0);
|
||||||
|
public bool Found => SbCbSlot != -1;
|
||||||
|
public int SbCbSlot { get; }
|
||||||
|
public int SbCbOffset { get; }
|
||||||
|
|
||||||
|
public SearchResult(int sbCbSlot, int sbCbOffset)
|
||||||
|
{
|
||||||
|
SbCbSlot = sbCbSlot;
|
||||||
|
SbCbOffset = sbCbOffset;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public static void RunPass(BasicBlock block, ShaderConfig config, ref int sbUseMask, ref int ubeUseMask)
|
public static void RunPass(BasicBlock block, ShaderConfig config, ref int sbUseMask, ref int ubeUseMask)
|
||||||
{
|
{
|
||||||
int sbStart = GetStorageBaseCbOffset(config.Stage);
|
int sbStart = GetStorageBaseCbOffset(config.Stage);
|
||||||
@@ -49,30 +63,33 @@ namespace Ryujinx.Graphics.Shader.Translation.Optimizations
|
|||||||
{
|
{
|
||||||
Operand source = operation.GetSource(0);
|
Operand source = operation.GetSource(0);
|
||||||
|
|
||||||
int storageIndex = SearchForStorageBase(block, source, sbStart, sbEnd);
|
var result = SearchForStorageBase(config, block, source);
|
||||||
|
if (!result.Found)
|
||||||
if (storageIndex >= 0)
|
|
||||||
{
|
{
|
||||||
// Storage buffers are implemented using global memory access.
|
continue;
|
||||||
// If we know from where the base address of the access is loaded,
|
|
||||||
// we can guess which storage buffer it is accessing.
|
|
||||||
// We can then replace the global memory access with a storage
|
|
||||||
// buffer access.
|
|
||||||
node = ReplaceGlobalWithStorage(block, node, config, storageIndex);
|
|
||||||
}
|
}
|
||||||
else if (config.Stage == ShaderStage.Compute && operation.Inst == Instruction.LoadGlobal)
|
|
||||||
|
if (config.Stage == ShaderStage.Compute &&
|
||||||
|
operation.Inst == Instruction.LoadGlobal &&
|
||||||
|
result.SbCbSlot == DriverReservedCb &&
|
||||||
|
result.SbCbOffset >= UbeBaseOffset &&
|
||||||
|
result.SbCbOffset < UbeBaseOffset + UbeDescsSize)
|
||||||
{
|
{
|
||||||
// Here we effectively try to replace a LDG instruction with LDC.
|
// Here we effectively try to replace a LDG instruction with LDC.
|
||||||
// The hardware only supports a limited amount of constant buffers
|
// The hardware only supports a limited amount of constant buffers
|
||||||
// so NVN "emulates" more constant buffers using global memory access.
|
// so NVN "emulates" more constant buffers using global memory access.
|
||||||
// Here we try to replace the global access back to a constant buffer
|
// Here we try to replace the global access back to a constant buffer
|
||||||
// load.
|
// load.
|
||||||
storageIndex = SearchForStorageBase(block, source, ubeStart, ubeStart + ubeEnd);
|
node = ReplaceLdgWithLdc(node, config, (result.SbCbOffset - UbeBaseOffset) / StorageDescSize);
|
||||||
|
|
||||||
if (storageIndex >= 0)
|
|
||||||
{
|
|
||||||
node = ReplaceLdgWithLdc(node, config, storageIndex);
|
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// Storage buffers are implemented using global memory access.
|
||||||
|
// If we know from where the base address of the access is loaded,
|
||||||
|
// we can guess which storage buffer it is accessing.
|
||||||
|
// We can then replace the global memory access with a storage
|
||||||
|
// buffer access.
|
||||||
|
node = ReplaceGlobalWithStorage(block, node, config, config.GetSbSlot((byte)result.SbCbSlot, (ushort)result.SbCbOffset));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -144,12 +161,12 @@ namespace Ryujinx.Graphics.Shader.Translation.Optimizations
|
|||||||
Operand addrLow,
|
Operand addrLow,
|
||||||
bool isStg16Or8)
|
bool isStg16Or8)
|
||||||
{
|
{
|
||||||
int baseAddressCbOffset = GetStorageCbOffset(config.Stage, storageIndex);
|
(int sbCbSlot, int sbCbOffset) = config.GetSbCbInfo(storageIndex);
|
||||||
|
|
||||||
bool storageAligned = !(config.GpuAccessor.QueryHasUnalignedStorageBuffer() || config.GpuAccessor.QueryHostStorageBufferOffsetAlignment() > Constants.StorageAlignment);
|
bool storageAligned = !(config.GpuAccessor.QueryHasUnalignedStorageBuffer() || config.GpuAccessor.QueryHostStorageBufferOffsetAlignment() > Constants.StorageAlignment);
|
||||||
|
|
||||||
(Operand byteOffset, int constantOffset) = storageAligned ?
|
(Operand byteOffset, int constantOffset) = storageAligned ?
|
||||||
GetStorageOffset(block, Utils.FindLastOperation(addrLow, block), baseAddressCbOffset) :
|
GetStorageOffset(block, Utils.FindLastOperation(addrLow, block), sbCbSlot, sbCbOffset) :
|
||||||
(null, 0);
|
(null, 0);
|
||||||
|
|
||||||
if (byteOffset != null)
|
if (byteOffset != null)
|
||||||
@@ -159,7 +176,7 @@ namespace Ryujinx.Graphics.Shader.Translation.Optimizations
|
|||||||
|
|
||||||
if (byteOffset == null)
|
if (byteOffset == null)
|
||||||
{
|
{
|
||||||
Operand baseAddrLow = Cbuf(0, baseAddressCbOffset);
|
Operand baseAddrLow = Cbuf(sbCbSlot, sbCbOffset);
|
||||||
Operand baseAddrTrunc = Local();
|
Operand baseAddrTrunc = Local();
|
||||||
|
|
||||||
Operand alignMask = Const(-config.GpuAccessor.QueryHostStorageBufferOffsetAlignment());
|
Operand alignMask = Const(-config.GpuAccessor.QueryHostStorageBufferOffsetAlignment());
|
||||||
@@ -198,9 +215,9 @@ namespace Ryujinx.Graphics.Shader.Translation.Optimizations
|
|||||||
return wordOffset;
|
return wordOffset;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static bool IsCb0Offset(Operand operand, int offset)
|
private static bool IsCbOffset(Operand operand, int slot, int offset)
|
||||||
{
|
{
|
||||||
return operand.Type == OperandType.ConstantBuffer && operand.GetCbufSlot() == 0 && operand.GetCbufOffset() == offset;
|
return operand.Type == OperandType.ConstantBuffer && operand.GetCbufSlot() == slot && operand.GetCbufOffset() == offset;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void ReplaceAddressAlignment(LinkedList<INode> list, Operand address, Operand byteOffset, int constantOffset)
|
private static void ReplaceAddressAlignment(LinkedList<INode> list, Operand address, Operand byteOffset, int constantOffset)
|
||||||
@@ -244,9 +261,9 @@ namespace Ryujinx.Graphics.Shader.Translation.Optimizations
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static (Operand, int) GetStorageOffset(BasicBlock block, Operand address, int baseAddressCbOffset)
|
private static (Operand, int) GetStorageOffset(BasicBlock block, Operand address, int cbSlot, int baseAddressCbOffset)
|
||||||
{
|
{
|
||||||
if (IsCb0Offset(address, baseAddressCbOffset))
|
if (IsCbOffset(address, cbSlot, baseAddressCbOffset))
|
||||||
{
|
{
|
||||||
// Direct offset: zero.
|
// Direct offset: zero.
|
||||||
return (Const(0), 0);
|
return (Const(0), 0);
|
||||||
@@ -256,7 +273,7 @@ namespace Ryujinx.Graphics.Shader.Translation.Optimizations
|
|||||||
|
|
||||||
address = Utils.FindLastOperation(address, block);
|
address = Utils.FindLastOperation(address, block);
|
||||||
|
|
||||||
if (IsCb0Offset(address, baseAddressCbOffset))
|
if (IsCbOffset(address, cbSlot, baseAddressCbOffset))
|
||||||
{
|
{
|
||||||
// Only constant offset
|
// Only constant offset
|
||||||
return (Const(0), constantOffset);
|
return (Const(0), constantOffset);
|
||||||
@@ -270,11 +287,11 @@ namespace Ryujinx.Graphics.Shader.Translation.Optimizations
|
|||||||
Operand src1 = offsetAdd.GetSource(0);
|
Operand src1 = offsetAdd.GetSource(0);
|
||||||
Operand src2 = Utils.FindLastOperation(offsetAdd.GetSource(1), block);
|
Operand src2 = Utils.FindLastOperation(offsetAdd.GetSource(1), block);
|
||||||
|
|
||||||
if (IsCb0Offset(src2, baseAddressCbOffset))
|
if (IsCbOffset(src2, cbSlot, baseAddressCbOffset))
|
||||||
{
|
{
|
||||||
return (src1, constantOffset);
|
return (src1, constantOffset);
|
||||||
}
|
}
|
||||||
else if (IsCb0Offset(src1, baseAddressCbOffset))
|
else if (IsCbOffset(src1, cbSlot, baseAddressCbOffset))
|
||||||
{
|
{
|
||||||
return (src2, constantOffset);
|
return (src2, constantOffset);
|
||||||
}
|
}
|
||||||
@@ -360,20 +377,20 @@ namespace Ryujinx.Graphics.Shader.Translation.Optimizations
|
|||||||
return node;
|
return node;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static int SearchForStorageBase(BasicBlock block, Operand globalAddress, int sbStart, int sbEnd)
|
private static SearchResult SearchForStorageBase(ShaderConfig config, BasicBlock block, Operand globalAddress)
|
||||||
{
|
{
|
||||||
globalAddress = Utils.FindLastOperation(globalAddress, block);
|
globalAddress = Utils.FindLastOperation(globalAddress, block);
|
||||||
|
|
||||||
if (globalAddress.Type == OperandType.ConstantBuffer)
|
if (globalAddress.Type == OperandType.ConstantBuffer)
|
||||||
{
|
{
|
||||||
return GetStorageIndex(globalAddress, sbStart, sbEnd);
|
return GetStorageIndex(config, globalAddress);
|
||||||
}
|
}
|
||||||
|
|
||||||
Operation operation = globalAddress.AsgOp as Operation;
|
Operation operation = globalAddress.AsgOp as Operation;
|
||||||
|
|
||||||
if (operation == null || operation.Inst != Instruction.Add)
|
if (operation == null || operation.Inst != Instruction.Add)
|
||||||
{
|
{
|
||||||
return -1;
|
return SearchResult.NotFound;
|
||||||
}
|
}
|
||||||
|
|
||||||
Operand src1 = operation.GetSource(0);
|
Operand src1 = operation.GetSource(0);
|
||||||
@@ -382,34 +399,65 @@ namespace Ryujinx.Graphics.Shader.Translation.Optimizations
|
|||||||
if ((src1.Type == OperandType.LocalVariable && src2.Type == OperandType.Constant) ||
|
if ((src1.Type == OperandType.LocalVariable && src2.Type == OperandType.Constant) ||
|
||||||
(src2.Type == OperandType.LocalVariable && src1.Type == OperandType.Constant))
|
(src2.Type == OperandType.LocalVariable && src1.Type == OperandType.Constant))
|
||||||
{
|
{
|
||||||
|
Operand baseAddr;
|
||||||
|
|
||||||
if (src1.Type == OperandType.LocalVariable)
|
if (src1.Type == OperandType.LocalVariable)
|
||||||
{
|
{
|
||||||
operation = Utils.FindLastOperation(src1, block).AsgOp as Operation;
|
baseAddr = Utils.FindLastOperation(src1, block);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
operation = Utils.FindLastOperation(src2, block).AsgOp as Operation;
|
baseAddr = Utils.FindLastOperation(src2, block);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var result = GetStorageIndex(config, baseAddr);
|
||||||
|
if (result.Found)
|
||||||
|
{
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
operation = baseAddr.AsgOp as Operation;
|
||||||
|
|
||||||
if (operation == null || operation.Inst != Instruction.Add)
|
if (operation == null || operation.Inst != Instruction.Add)
|
||||||
{
|
{
|
||||||
return -1;
|
return SearchResult.NotFound;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var selectedResult = SearchResult.NotFound;
|
||||||
|
|
||||||
for (int index = 0; index < operation.SourcesCount; index++)
|
for (int index = 0; index < operation.SourcesCount; index++)
|
||||||
{
|
{
|
||||||
Operand source = operation.GetSource(index);
|
Operand source = operation.GetSource(index);
|
||||||
|
|
||||||
int storageIndex = GetStorageIndex(source, sbStart, sbEnd);
|
var result = GetStorageIndex(config, source);
|
||||||
|
|
||||||
if (storageIndex != -1)
|
// If we already have a result, we give preference to the ones from
|
||||||
|
// the driver reserved constant buffer, as those are the ones that
|
||||||
|
// contains the base address.
|
||||||
|
if (result.Found && (!selectedResult.Found || result.SbCbSlot == GlobalMemory.DriverReservedCb))
|
||||||
{
|
{
|
||||||
return storageIndex;
|
selectedResult = result;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return -1;
|
return selectedResult;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static SearchResult GetStorageIndex(ShaderConfig config, Operand operand)
|
||||||
|
{
|
||||||
|
if (operand.Type == OperandType.ConstantBuffer)
|
||||||
|
{
|
||||||
|
int slot = operand.GetCbufSlot();
|
||||||
|
int offset = operand.GetCbufOffset();
|
||||||
|
|
||||||
|
if ((offset & 3) == 0)
|
||||||
|
{
|
||||||
|
return new SearchResult(slot, offset);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return SearchResult.NotFound;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static int GetStorageIndex(Operand operand, int sbStart, int sbEnd)
|
private static int GetStorageIndex(Operand operand, int sbStart, int sbEnd)
|
||||||
|
@@ -68,7 +68,6 @@ namespace Ryujinx.Graphics.Shader.Translation.Optimizations
|
|||||||
}
|
}
|
||||||
|
|
||||||
ConstantFolding.RunPass(operation);
|
ConstantFolding.RunPass(operation);
|
||||||
|
|
||||||
Simplification.RunPass(operation);
|
Simplification.RunPass(operation);
|
||||||
|
|
||||||
if (DestIsLocalVar(operation))
|
if (DestIsLocalVar(operation))
|
||||||
|
@@ -110,9 +110,9 @@ namespace Ryujinx.Graphics.Shader.Translation
|
|||||||
|
|
||||||
Operand BindingRangeCheck(int cbOffset, out Operand baseAddrLow)
|
Operand BindingRangeCheck(int cbOffset, out Operand baseAddrLow)
|
||||||
{
|
{
|
||||||
baseAddrLow = Cbuf(0, cbOffset);
|
baseAddrLow = Cbuf(DriverReservedCb, cbOffset);
|
||||||
Operand baseAddrHigh = Cbuf(0, cbOffset + 1);
|
Operand baseAddrHigh = Cbuf(DriverReservedCb, cbOffset + 1);
|
||||||
Operand size = Cbuf(0, cbOffset + 2);
|
Operand size = Cbuf(DriverReservedCb, cbOffset + 2);
|
||||||
|
|
||||||
Operand offset = PrependOperation(Instruction.Subtract, addrLow, baseAddrLow);
|
Operand offset = PrependOperation(Instruction.Subtract, addrLow, baseAddrLow);
|
||||||
Operand borrow = PrependOperation(Instruction.CompareLessU32, addrLow, baseAddrLow);
|
Operand borrow = PrependOperation(Instruction.CompareLessU32, addrLow, baseAddrLow);
|
||||||
@@ -134,9 +134,10 @@ namespace Ryujinx.Graphics.Shader.Translation
|
|||||||
|
|
||||||
sbUseMask &= ~(1 << slot);
|
sbUseMask &= ~(1 << slot);
|
||||||
|
|
||||||
config.SetUsedStorageBuffer(slot, isWrite);
|
|
||||||
|
|
||||||
int cbOffset = GetStorageCbOffset(config.Stage, slot);
|
int cbOffset = GetStorageCbOffset(config.Stage, slot);
|
||||||
|
slot = config.GetSbSlot(DriverReservedCb, (ushort)cbOffset);
|
||||||
|
|
||||||
|
config.SetUsedStorageBuffer(slot, isWrite);
|
||||||
|
|
||||||
Operand inRange = BindingRangeCheck(cbOffset, out Operand baseAddrLow);
|
Operand inRange = BindingRangeCheck(cbOffset, out Operand baseAddrLow);
|
||||||
|
|
||||||
|
@@ -125,6 +125,9 @@ namespace Ryujinx.Graphics.Shader.Translation
|
|||||||
private readonly Dictionary<TextureInfo, TextureMeta> _usedTextures;
|
private readonly Dictionary<TextureInfo, TextureMeta> _usedTextures;
|
||||||
private readonly Dictionary<TextureInfo, TextureMeta> _usedImages;
|
private readonly Dictionary<TextureInfo, TextureMeta> _usedImages;
|
||||||
|
|
||||||
|
private readonly Dictionary<int, int> _sbSlots;
|
||||||
|
private readonly Dictionary<int, int> _sbSlotsReverse;
|
||||||
|
|
||||||
private BufferDescriptor[] _cachedConstantBufferDescriptors;
|
private BufferDescriptor[] _cachedConstantBufferDescriptors;
|
||||||
private BufferDescriptor[] _cachedStorageBufferDescriptors;
|
private BufferDescriptor[] _cachedStorageBufferDescriptors;
|
||||||
private TextureDescriptor[] _cachedTextureDescriptors;
|
private TextureDescriptor[] _cachedTextureDescriptors;
|
||||||
@@ -152,6 +155,9 @@ namespace Ryujinx.Graphics.Shader.Translation
|
|||||||
|
|
||||||
_usedTextures = new Dictionary<TextureInfo, TextureMeta>();
|
_usedTextures = new Dictionary<TextureInfo, TextureMeta>();
|
||||||
_usedImages = new Dictionary<TextureInfo, TextureMeta>();
|
_usedImages = new Dictionary<TextureInfo, TextureMeta>();
|
||||||
|
|
||||||
|
_sbSlots = new Dictionary<int, int>();
|
||||||
|
_sbSlotsReverse = new Dictionary<int, int>();
|
||||||
}
|
}
|
||||||
|
|
||||||
public ShaderConfig(
|
public ShaderConfig(
|
||||||
@@ -770,9 +776,8 @@ namespace Ryujinx.Graphics.Shader.Translation
|
|||||||
usedMask |= (int)GpuAccessor.QueryConstantBufferUse();
|
usedMask |= (int)GpuAccessor.QueryConstantBufferUse();
|
||||||
}
|
}
|
||||||
|
|
||||||
return _cachedConstantBufferDescriptors = GetBufferDescriptors(
|
return _cachedConstantBufferDescriptors = GetUniformBufferDescriptors(
|
||||||
usedMask,
|
usedMask,
|
||||||
0,
|
|
||||||
UsedFeatures.HasFlag(FeatureFlags.CbIndexing),
|
UsedFeatures.HasFlag(FeatureFlags.CbIndexing),
|
||||||
out _firstConstantBufferBinding,
|
out _firstConstantBufferBinding,
|
||||||
GpuAccessor.QueryBindingConstantBuffer);
|
GpuAccessor.QueryBindingConstantBuffer);
|
||||||
@@ -785,7 +790,7 @@ namespace Ryujinx.Graphics.Shader.Translation
|
|||||||
return _cachedStorageBufferDescriptors;
|
return _cachedStorageBufferDescriptors;
|
||||||
}
|
}
|
||||||
|
|
||||||
return _cachedStorageBufferDescriptors = GetBufferDescriptors(
|
return _cachedStorageBufferDescriptors = GetStorageBufferDescriptors(
|
||||||
_usedStorageBuffers,
|
_usedStorageBuffers,
|
||||||
_usedStorageBuffersWrite,
|
_usedStorageBuffersWrite,
|
||||||
true,
|
true,
|
||||||
@@ -793,7 +798,48 @@ namespace Ryujinx.Graphics.Shader.Translation
|
|||||||
GpuAccessor.QueryBindingStorageBuffer);
|
GpuAccessor.QueryBindingStorageBuffer);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static BufferDescriptor[] GetBufferDescriptors(
|
private static BufferDescriptor[] GetUniformBufferDescriptors(int usedMask, bool isArray, out int firstBinding, Func<int, int> getBindingCallback)
|
||||||
|
{
|
||||||
|
firstBinding = 0;
|
||||||
|
int lastSlot = -1;
|
||||||
|
bool hasFirstBinding = false;
|
||||||
|
var descriptors = new BufferDescriptor[BitOperations.PopCount((uint)usedMask)];
|
||||||
|
|
||||||
|
for (int i = 0; i < descriptors.Length; i++)
|
||||||
|
{
|
||||||
|
int slot = BitOperations.TrailingZeroCount(usedMask);
|
||||||
|
|
||||||
|
if (isArray)
|
||||||
|
{
|
||||||
|
// The next array entries also consumes bindings, even if they are unused.
|
||||||
|
for (int j = lastSlot + 1; j < slot; j++)
|
||||||
|
{
|
||||||
|
int binding = getBindingCallback(j);
|
||||||
|
|
||||||
|
if (!hasFirstBinding)
|
||||||
|
{
|
||||||
|
firstBinding = binding;
|
||||||
|
hasFirstBinding = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
lastSlot = slot;
|
||||||
|
descriptors[i] = new BufferDescriptor(getBindingCallback(slot), slot);
|
||||||
|
|
||||||
|
if (!hasFirstBinding)
|
||||||
|
{
|
||||||
|
firstBinding = descriptors[i].Binding;
|
||||||
|
hasFirstBinding = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
usedMask &= ~(1 << slot);
|
||||||
|
}
|
||||||
|
|
||||||
|
return descriptors;
|
||||||
|
}
|
||||||
|
|
||||||
|
private BufferDescriptor[] GetStorageBufferDescriptors(
|
||||||
int usedMask,
|
int usedMask,
|
||||||
int writtenMask,
|
int writtenMask,
|
||||||
bool isArray,
|
bool isArray,
|
||||||
@@ -827,7 +873,9 @@ namespace Ryujinx.Graphics.Shader.Translation
|
|||||||
|
|
||||||
lastSlot = slot;
|
lastSlot = slot;
|
||||||
|
|
||||||
descriptors[i] = new BufferDescriptor(getBindingCallback(slot), slot);
|
(int sbCbSlot, int sbCbOffset) = GetSbCbInfo(slot);
|
||||||
|
|
||||||
|
descriptors[i] = new BufferDescriptor(getBindingCallback(slot), slot, sbCbSlot, sbCbOffset);
|
||||||
|
|
||||||
if (!hasFirstBinding)
|
if (!hasFirstBinding)
|
||||||
{
|
{
|
||||||
@@ -924,6 +972,40 @@ namespace Ryujinx.Graphics.Shader.Translation
|
|||||||
return FindDescriptorIndex(GetImageDescriptors(), texOp);
|
return FindDescriptorIndex(GetImageDescriptors(), texOp);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public int GetSbSlot(byte sbCbSlot, ushort sbCbOffset)
|
||||||
|
{
|
||||||
|
int key = PackSbCbInfo(sbCbSlot, sbCbOffset);
|
||||||
|
|
||||||
|
if (!_sbSlots.TryGetValue(key, out int slot))
|
||||||
|
{
|
||||||
|
slot = _sbSlots.Count;
|
||||||
|
_sbSlots.Add(key, slot);
|
||||||
|
_sbSlotsReverse.Add(slot, key);
|
||||||
|
}
|
||||||
|
|
||||||
|
return slot;
|
||||||
|
}
|
||||||
|
|
||||||
|
public (int, int) GetSbCbInfo(int slot)
|
||||||
|
{
|
||||||
|
if (_sbSlotsReverse.TryGetValue(slot, out int key))
|
||||||
|
{
|
||||||
|
return UnpackSbCbInfo(key);
|
||||||
|
}
|
||||||
|
|
||||||
|
throw new ArgumentException($"Invalid slot {slot}.", nameof(slot));
|
||||||
|
}
|
||||||
|
|
||||||
|
private static int PackSbCbInfo(int sbCbSlot, int sbCbOffset)
|
||||||
|
{
|
||||||
|
return sbCbOffset | ((int)sbCbSlot << 16);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static (int, int) UnpackSbCbInfo(int key)
|
||||||
|
{
|
||||||
|
return ((byte)(key >> 16), (ushort)key);
|
||||||
|
}
|
||||||
|
|
||||||
public ShaderProgramInfo CreateProgramInfo(ShaderIdentification identification = ShaderIdentification.None)
|
public ShaderProgramInfo CreateProgramInfo(ShaderIdentification identification = ShaderIdentification.None)
|
||||||
{
|
{
|
||||||
return new ShaderProgramInfo(
|
return new ShaderProgramInfo(
|
||||||
|
@@ -105,6 +105,23 @@ namespace Ryujinx.Graphics.Vulkan
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public bool TryIncrementReferenceCount()
|
||||||
|
{
|
||||||
|
int lastValue;
|
||||||
|
do
|
||||||
|
{
|
||||||
|
lastValue = _referenceCount;
|
||||||
|
|
||||||
|
if (lastValue == 0)
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
while (Interlocked.CompareExchange(ref _referenceCount, lastValue + 1, lastValue) != lastValue);
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
public void IncrementReferenceCount()
|
public void IncrementReferenceCount()
|
||||||
{
|
{
|
||||||
if (Interlocked.Increment(ref _referenceCount) == 1)
|
if (Interlocked.Increment(ref _referenceCount) == 1)
|
||||||
|
@@ -599,9 +599,10 @@ namespace Ryujinx.Graphics.Vulkan
|
|||||||
Auto<DisposableBuffer> dst,
|
Auto<DisposableBuffer> dst,
|
||||||
int srcOffset,
|
int srcOffset,
|
||||||
int dstOffset,
|
int dstOffset,
|
||||||
int size)
|
int size,
|
||||||
|
bool registerSrcUsage = true)
|
||||||
{
|
{
|
||||||
var srcBuffer = src.Get(cbs, srcOffset, size).Value;
|
var srcBuffer = registerSrcUsage ? src.Get(cbs, srcOffset, size).Value : src.GetUnsafe().Value;
|
||||||
var dstBuffer = dst.Get(cbs, dstOffset, size).Value;
|
var dstBuffer = dst.Get(cbs, dstOffset, size).Value;
|
||||||
|
|
||||||
InsertBufferBarrier(
|
InsertBufferBarrier(
|
||||||
|
@@ -31,7 +31,7 @@ namespace Ryujinx.Graphics.Vulkan
|
|||||||
public SemaphoreHolder Semaphore;
|
public SemaphoreHolder Semaphore;
|
||||||
|
|
||||||
public List<IAuto> Dependants;
|
public List<IAuto> Dependants;
|
||||||
public HashSet<MultiFenceHolder> Waitables;
|
public List<MultiFenceHolder> Waitables;
|
||||||
public HashSet<SemaphoreHolder> Dependencies;
|
public HashSet<SemaphoreHolder> Dependencies;
|
||||||
|
|
||||||
public void Initialize(Vk api, Device device, CommandPool pool)
|
public void Initialize(Vk api, Device device, CommandPool pool)
|
||||||
@@ -47,7 +47,7 @@ namespace Ryujinx.Graphics.Vulkan
|
|||||||
api.AllocateCommandBuffers(device, allocateInfo, out CommandBuffer);
|
api.AllocateCommandBuffers(device, allocateInfo, out CommandBuffer);
|
||||||
|
|
||||||
Dependants = new List<IAuto>();
|
Dependants = new List<IAuto>();
|
||||||
Waitables = new HashSet<MultiFenceHolder>();
|
Waitables = new List<MultiFenceHolder>();
|
||||||
Dependencies = new HashSet<SemaphoreHolder>();
|
Dependencies = new HashSet<SemaphoreHolder>();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -143,9 +143,11 @@ namespace Ryujinx.Graphics.Vulkan
|
|||||||
public void AddWaitable(int cbIndex, MultiFenceHolder waitable)
|
public void AddWaitable(int cbIndex, MultiFenceHolder waitable)
|
||||||
{
|
{
|
||||||
ref var entry = ref _commandBuffers[cbIndex];
|
ref var entry = ref _commandBuffers[cbIndex];
|
||||||
waitable.AddFence(cbIndex, entry.Fence);
|
if (waitable.AddFence(cbIndex, entry.Fence))
|
||||||
|
{
|
||||||
entry.Waitables.Add(waitable);
|
entry.Waitables.Add(waitable);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public bool HasWaitableOnRentedCommandBuffer(MultiFenceHolder waitable, int offset, int size)
|
public bool HasWaitableOnRentedCommandBuffer(MultiFenceHolder waitable, int offset, int size)
|
||||||
{
|
{
|
||||||
@@ -156,7 +158,7 @@ namespace Ryujinx.Graphics.Vulkan
|
|||||||
ref var entry = ref _commandBuffers[i];
|
ref var entry = ref _commandBuffers[i];
|
||||||
|
|
||||||
if (entry.InUse &&
|
if (entry.InUse &&
|
||||||
entry.Waitables.Contains(waitable) &&
|
waitable.HasFence(i) &&
|
||||||
waitable.IsBufferRangeInUse(i, offset, size))
|
waitable.IsBufferRangeInUse(i, offset, size))
|
||||||
{
|
{
|
||||||
return true;
|
return true;
|
||||||
@@ -331,7 +333,7 @@ namespace Ryujinx.Graphics.Vulkan
|
|||||||
|
|
||||||
foreach (var waitable in entry.Waitables)
|
foreach (var waitable in entry.Waitables)
|
||||||
{
|
{
|
||||||
waitable.RemoveFence(cbIndex, entry.Fence);
|
waitable.RemoveFence(cbIndex);
|
||||||
waitable.RemoveBufferUses(cbIndex);
|
waitable.RemoveBufferUses(cbIndex);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -32,6 +32,25 @@ namespace Ryujinx.Graphics.Vulkan
|
|||||||
return _fence;
|
return _fence;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public bool TryGet(out Fence fence)
|
||||||
|
{
|
||||||
|
int lastValue;
|
||||||
|
do
|
||||||
|
{
|
||||||
|
lastValue = _referenceCount;
|
||||||
|
|
||||||
|
if (lastValue == 0)
|
||||||
|
{
|
||||||
|
fence = default;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
while (Interlocked.CompareExchange(ref _referenceCount, lastValue + 1, lastValue) != lastValue);
|
||||||
|
|
||||||
|
fence = _fence;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
public Fence Get()
|
public Fence Get()
|
||||||
{
|
{
|
||||||
Interlocked.Increment(ref _referenceCount);
|
Interlocked.Increment(ref _referenceCount);
|
||||||
|
@@ -1,6 +1,5 @@
|
|||||||
using Silk.NET.Vulkan;
|
using Silk.NET.Vulkan;
|
||||||
using System.Collections.Generic;
|
using System;
|
||||||
using System.Linq;
|
|
||||||
|
|
||||||
namespace Ryujinx.Graphics.Vulkan
|
namespace Ryujinx.Graphics.Vulkan
|
||||||
{
|
{
|
||||||
@@ -11,7 +10,7 @@ namespace Ryujinx.Graphics.Vulkan
|
|||||||
{
|
{
|
||||||
private static int BufferUsageTrackingGranularity = 4096;
|
private static int BufferUsageTrackingGranularity = 4096;
|
||||||
|
|
||||||
private readonly Dictionary<FenceHolder, int> _fences;
|
private readonly FenceHolder[] _fences;
|
||||||
private BufferUsageBitmap _bufferUsageBitmap;
|
private BufferUsageBitmap _bufferUsageBitmap;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -19,7 +18,7 @@ namespace Ryujinx.Graphics.Vulkan
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public MultiFenceHolder()
|
public MultiFenceHolder()
|
||||||
{
|
{
|
||||||
_fences = new Dictionary<FenceHolder, int>();
|
_fences = new FenceHolder[CommandBufferPool.MaxCommandBuffers];
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -28,7 +27,7 @@ namespace Ryujinx.Graphics.Vulkan
|
|||||||
/// <param name="size">Size of the buffer</param>
|
/// <param name="size">Size of the buffer</param>
|
||||||
public MultiFenceHolder(int size)
|
public MultiFenceHolder(int size)
|
||||||
{
|
{
|
||||||
_fences = new Dictionary<FenceHolder, int>();
|
_fences = new FenceHolder[CommandBufferPool.MaxCommandBuffers];
|
||||||
_bufferUsageBitmap = new BufferUsageBitmap(size, BufferUsageTrackingGranularity);
|
_bufferUsageBitmap = new BufferUsageBitmap(size, BufferUsageTrackingGranularity);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -80,25 +79,37 @@ namespace Ryujinx.Graphics.Vulkan
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="cbIndex">Command buffer index of the command buffer that owns the fence</param>
|
/// <param name="cbIndex">Command buffer index of the command buffer that owns the fence</param>
|
||||||
/// <param name="fence">Fence to be added</param>
|
/// <param name="fence">Fence to be added</param>
|
||||||
public void AddFence(int cbIndex, FenceHolder fence)
|
/// <returns>True if the command buffer's previous fence value was null</returns>
|
||||||
|
public bool AddFence(int cbIndex, FenceHolder fence)
|
||||||
{
|
{
|
||||||
lock (_fences)
|
ref FenceHolder fenceRef = ref _fences[cbIndex];
|
||||||
|
|
||||||
|
if (fenceRef == null)
|
||||||
{
|
{
|
||||||
_fences.TryAdd(fence, cbIndex);
|
fenceRef = fence;
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Removes a fence from the holder.
|
/// Removes a fence from the holder.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="cbIndex">Command buffer index of the command buffer that owns the fence</param>
|
/// <param name="cbIndex">Command buffer index of the command buffer that owns the fence</param>
|
||||||
/// <param name="fence">Fence to be removed</param>
|
public void RemoveFence(int cbIndex)
|
||||||
public void RemoveFence(int cbIndex, FenceHolder fence)
|
|
||||||
{
|
{
|
||||||
lock (_fences)
|
_fences[cbIndex] = null;
|
||||||
{
|
|
||||||
_fences.Remove(fence);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Determines if a fence referenced on the given command buffer.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="cbIndex">Index of the command buffer to check if it's used</param>
|
||||||
|
/// <returns>True if referenced, false otherwise</returns>
|
||||||
|
public bool HasFence(int cbIndex)
|
||||||
|
{
|
||||||
|
return _fences[cbIndex] != null;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -147,21 +158,29 @@ namespace Ryujinx.Graphics.Vulkan
|
|||||||
/// <returns>True if all fences were signaled before the timeout expired, false otherwise</returns>
|
/// <returns>True if all fences were signaled before the timeout expired, false otherwise</returns>
|
||||||
private bool WaitForFencesImpl(Vk api, Device device, int offset, int size, bool hasTimeout, ulong timeout)
|
private bool WaitForFencesImpl(Vk api, Device device, int offset, int size, bool hasTimeout, ulong timeout)
|
||||||
{
|
{
|
||||||
FenceHolder[] fenceHolders;
|
Span<FenceHolder> fenceHolders = new FenceHolder[CommandBufferPool.MaxCommandBuffers];
|
||||||
Fence[] fences;
|
|
||||||
|
|
||||||
lock (_fences)
|
int count = size != 0 ? GetOverlappingFences(fenceHolders, offset, size) : GetFences(fenceHolders);
|
||||||
{
|
Span<Fence> fences = stackalloc Fence[count];
|
||||||
fenceHolders = size != 0 ? GetOverlappingFences(offset, size) : _fences.Keys.ToArray();
|
|
||||||
fences = new Fence[fenceHolders.Length];
|
|
||||||
|
|
||||||
for (int i = 0; i < fenceHolders.Length; i++)
|
int fenceCount = 0;
|
||||||
|
|
||||||
|
for (int i = 0; i < count; i++)
|
||||||
{
|
{
|
||||||
fences[i] = fenceHolders[i].Get();
|
if (fenceHolders[i].TryGet(out Fence fence))
|
||||||
|
{
|
||||||
|
fences[fenceCount] = fence;
|
||||||
|
|
||||||
|
if (fenceCount < i)
|
||||||
|
{
|
||||||
|
fenceHolders[fenceCount] = fenceHolders[i];
|
||||||
|
}
|
||||||
|
|
||||||
|
fenceCount++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (fences.Length == 0)
|
if (fenceCount == 0)
|
||||||
{
|
{
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@@ -170,14 +189,14 @@ namespace Ryujinx.Graphics.Vulkan
|
|||||||
|
|
||||||
if (hasTimeout)
|
if (hasTimeout)
|
||||||
{
|
{
|
||||||
signaled = FenceHelper.AllSignaled(api, device, fences, timeout);
|
signaled = FenceHelper.AllSignaled(api, device, fences.Slice(0, fenceCount), timeout);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
FenceHelper.WaitAllIndefinitely(api, device, fences);
|
FenceHelper.WaitAllIndefinitely(api, device, fences.Slice(0, fenceCount));
|
||||||
}
|
}
|
||||||
|
|
||||||
for (int i = 0; i < fenceHolders.Length; i++)
|
for (int i = 0; i < fenceCount; i++)
|
||||||
{
|
{
|
||||||
fenceHolders[i].Put();
|
fenceHolders[i].Put();
|
||||||
}
|
}
|
||||||
@@ -185,28 +204,50 @@ namespace Ryujinx.Graphics.Vulkan
|
|||||||
return signaled;
|
return signaled;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets fences to wait for.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="storage">Span to store fences in</param>
|
||||||
|
/// <returns>Number of fences placed in storage</returns>
|
||||||
|
private int GetFences(Span<FenceHolder> storage)
|
||||||
|
{
|
||||||
|
int count = 0;
|
||||||
|
|
||||||
|
for (int i = 0; i < _fences.Length; i++)
|
||||||
|
{
|
||||||
|
var fence = _fences[i];
|
||||||
|
|
||||||
|
if (fence != null)
|
||||||
|
{
|
||||||
|
storage[count++] = fence;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return count;
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets fences to wait for use of a given buffer region.
|
/// Gets fences to wait for use of a given buffer region.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
/// <param name="storage">Span to store overlapping fences in</param>
|
||||||
/// <param name="offset">Offset of the range</param>
|
/// <param name="offset">Offset of the range</param>
|
||||||
/// <param name="size">Size of the range in bytes</param>
|
/// <param name="size">Size of the range in bytes</param>
|
||||||
/// <returns>Fences for the specified region</returns>
|
/// <returns>Number of fences for the specified region placed in storage</returns>
|
||||||
private FenceHolder[] GetOverlappingFences(int offset, int size)
|
private int GetOverlappingFences(Span<FenceHolder> storage, int offset, int size)
|
||||||
{
|
{
|
||||||
List<FenceHolder> overlapping = new List<FenceHolder>();
|
int count = 0;
|
||||||
|
|
||||||
foreach (var kv in _fences)
|
for (int i = 0; i < _fences.Length; i++)
|
||||||
{
|
{
|
||||||
var fence = kv.Key;
|
var fence = _fences[i];
|
||||||
var ownerCbIndex = kv.Value;
|
|
||||||
|
|
||||||
if (_bufferUsageBitmap.OverlapsWith(ownerCbIndex, offset, size))
|
if (fence != null && _bufferUsageBitmap.OverlapsWith(i, offset, size))
|
||||||
{
|
{
|
||||||
overlapping.Add(fence);
|
storage[count++] = fence;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return overlapping.ToArray();
|
return count;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -34,16 +34,26 @@ namespace Ryujinx.Graphics.Vulkan
|
|||||||
public Span<byte> GetBufferData(CommandBufferPool cbp, BufferHolder buffer, int offset, int size)
|
public Span<byte> GetBufferData(CommandBufferPool cbp, BufferHolder buffer, int offset, int size)
|
||||||
{
|
{
|
||||||
var flushStorage = ResizeIfNeeded(size);
|
var flushStorage = ResizeIfNeeded(size);
|
||||||
|
Auto<DisposableBuffer> srcBuffer;
|
||||||
|
|
||||||
using (var cbs = cbp.Rent())
|
using (var cbs = cbp.Rent())
|
||||||
{
|
{
|
||||||
var srcBuffer = buffer.GetBuffer(cbs.CommandBuffer);
|
srcBuffer = buffer.GetBuffer(cbs.CommandBuffer);
|
||||||
var dstBuffer = flushStorage.GetBuffer(cbs.CommandBuffer);
|
var dstBuffer = flushStorage.GetBuffer(cbs.CommandBuffer);
|
||||||
|
|
||||||
BufferHolder.Copy(_gd, cbs, srcBuffer, dstBuffer, offset, 0, size);
|
if (srcBuffer.TryIncrementReferenceCount())
|
||||||
|
{
|
||||||
|
BufferHolder.Copy(_gd, cbs, srcBuffer, dstBuffer, offset, 0, size, registerSrcUsage: false);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// Source buffer is no longer alive, don't copy anything to flush storage.
|
||||||
|
srcBuffer = null;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
flushStorage.WaitForFences();
|
flushStorage.WaitForFences();
|
||||||
|
srcBuffer?.DecrementReferenceCount();
|
||||||
return flushStorage.GetDataStorage(0, size);
|
return flushStorage.GetDataStorage(0, size);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -66,6 +66,8 @@ namespace Ryujinx.Graphics.Vulkan
|
|||||||
private ulong _vertexBuffersDirty;
|
private ulong _vertexBuffersDirty;
|
||||||
protected Rectangle<int> ClearScissor;
|
protected Rectangle<int> ClearScissor;
|
||||||
|
|
||||||
|
private readonly VertexBufferUpdater _vertexBufferUpdater;
|
||||||
|
|
||||||
public SupportBufferUpdater SupportBufferUpdater;
|
public SupportBufferUpdater SupportBufferUpdater;
|
||||||
public IndexBufferPattern QuadsToTrisPattern;
|
public IndexBufferPattern QuadsToTrisPattern;
|
||||||
public IndexBufferPattern TriFanToTrisPattern;
|
public IndexBufferPattern TriFanToTrisPattern;
|
||||||
@@ -96,6 +98,7 @@ namespace Ryujinx.Graphics.Vulkan
|
|||||||
gd.Api.CreatePipelineCache(device, pipelineCacheCreateInfo, null, out PipelineCache).ThrowOnError();
|
gd.Api.CreatePipelineCache(device, pipelineCacheCreateInfo, null, out PipelineCache).ThrowOnError();
|
||||||
|
|
||||||
_descriptorSetUpdater = new DescriptorSetUpdater(gd, this);
|
_descriptorSetUpdater = new DescriptorSetUpdater(gd, this);
|
||||||
|
_vertexBufferUpdater = new VertexBufferUpdater(gd);
|
||||||
|
|
||||||
_transformFeedbackBuffers = new BufferState[Constants.MaxTransformFeedbackBuffers];
|
_transformFeedbackBuffers = new BufferState[Constants.MaxTransformFeedbackBuffers];
|
||||||
_vertexBuffers = new VertexBufferState[Constants.MaxVertexBuffers + 1];
|
_vertexBuffers = new VertexBufferState[Constants.MaxVertexBuffers + 1];
|
||||||
@@ -1015,8 +1018,8 @@ namespace Ryujinx.Graphics.Vulkan
|
|||||||
|
|
||||||
private void SetRenderTargetsInternal(ITexture[] colors, ITexture depthStencil, bool filterWriteMasked)
|
private void SetRenderTargetsInternal(ITexture[] colors, ITexture depthStencil, bool filterWriteMasked)
|
||||||
{
|
{
|
||||||
FramebufferParams?.UpdateModifications();
|
|
||||||
CreateFramebuffer(colors, depthStencil, filterWriteMasked);
|
CreateFramebuffer(colors, depthStencil, filterWriteMasked);
|
||||||
|
FramebufferParams?.UpdateModifications();
|
||||||
CreateRenderPass();
|
CreateRenderPass();
|
||||||
SignalStateChange();
|
SignalStateChange();
|
||||||
SignalAttachmentChange();
|
SignalAttachmentChange();
|
||||||
@@ -1185,6 +1188,9 @@ namespace Ryujinx.Graphics.Vulkan
|
|||||||
|
|
||||||
int validCount = 1;
|
int validCount = 1;
|
||||||
|
|
||||||
|
BufferHandle lastHandle = default;
|
||||||
|
Auto<DisposableBuffer> lastBuffer = default;
|
||||||
|
|
||||||
for (int i = 0; i < count; i++)
|
for (int i = 0; i < count; i++)
|
||||||
{
|
{
|
||||||
var vertexBuffer = vertexBuffers[i];
|
var vertexBuffer = vertexBuffers[i];
|
||||||
@@ -1194,7 +1200,12 @@ namespace Ryujinx.Graphics.Vulkan
|
|||||||
|
|
||||||
if (vertexBuffer.Buffer.Handle != BufferHandle.Null)
|
if (vertexBuffer.Buffer.Handle != BufferHandle.Null)
|
||||||
{
|
{
|
||||||
var vb = Gd.BufferManager.GetBuffer(CommandBuffer, vertexBuffer.Buffer.Handle, false);
|
Auto<DisposableBuffer> vb = (vertexBuffer.Buffer.Handle == lastHandle) ? lastBuffer :
|
||||||
|
Gd.BufferManager.GetBuffer(CommandBuffer, vertexBuffer.Buffer.Handle, false);
|
||||||
|
|
||||||
|
lastHandle = vertexBuffer.Buffer.Handle;
|
||||||
|
lastBuffer = vb;
|
||||||
|
|
||||||
if (vb != null)
|
if (vb != null)
|
||||||
{
|
{
|
||||||
int binding = i + 1;
|
int binding = i + 1;
|
||||||
@@ -1222,11 +1233,13 @@ namespace Ryujinx.Graphics.Vulkan
|
|||||||
ref var buffer = ref _vertexBuffers[binding];
|
ref var buffer = ref _vertexBuffers[binding];
|
||||||
int oldScalarAlign = buffer.AttributeScalarAlignment;
|
int oldScalarAlign = buffer.AttributeScalarAlignment;
|
||||||
|
|
||||||
buffer.Dispose();
|
|
||||||
|
|
||||||
if (Gd.Capabilities.VertexBufferAlignment < 2 &&
|
if (Gd.Capabilities.VertexBufferAlignment < 2 &&
|
||||||
(vertexBuffer.Stride % FormatExtensions.MaxBufferFormatScalarSize) == 0)
|
(vertexBuffer.Stride % FormatExtensions.MaxBufferFormatScalarSize) == 0)
|
||||||
{
|
{
|
||||||
|
if (!buffer.Matches(vb, descriptorIndex, vertexBuffer.Buffer.Offset, vbSize, vertexBuffer.Stride))
|
||||||
|
{
|
||||||
|
buffer.Dispose();
|
||||||
|
|
||||||
buffer = new VertexBufferState(
|
buffer = new VertexBufferState(
|
||||||
vb,
|
vb,
|
||||||
descriptorIndex,
|
descriptorIndex,
|
||||||
@@ -1234,12 +1247,15 @@ namespace Ryujinx.Graphics.Vulkan
|
|||||||
vbSize,
|
vbSize,
|
||||||
vertexBuffer.Stride);
|
vertexBuffer.Stride);
|
||||||
|
|
||||||
buffer.BindVertexBuffer(Gd, Cbs, (uint)binding, ref _newState);
|
buffer.BindVertexBuffer(Gd, Cbs, (uint)binding, ref _newState, _vertexBufferUpdater);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// May need to be rewritten. Bind this buffer before draw.
|
// May need to be rewritten. Bind this buffer before draw.
|
||||||
|
|
||||||
|
buffer.Dispose();
|
||||||
|
|
||||||
buffer = new VertexBufferState(
|
buffer = new VertexBufferState(
|
||||||
vertexBuffer.Buffer.Handle,
|
vertexBuffer.Buffer.Handle,
|
||||||
descriptorIndex,
|
descriptorIndex,
|
||||||
@@ -1255,6 +1271,8 @@ namespace Ryujinx.Graphics.Vulkan
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
_vertexBufferUpdater.Commit(Cbs);
|
||||||
|
|
||||||
_newState.VertexBindingDescriptionsCount = (uint)validCount;
|
_newState.VertexBindingDescriptionsCount = (uint)validCount;
|
||||||
SignalStateChange();
|
SignalStateChange();
|
||||||
}
|
}
|
||||||
@@ -1596,10 +1614,12 @@ namespace Ryujinx.Graphics.Vulkan
|
|||||||
{
|
{
|
||||||
int i = BitOperations.TrailingZeroCount(_vertexBuffersDirty);
|
int i = BitOperations.TrailingZeroCount(_vertexBuffersDirty);
|
||||||
|
|
||||||
_vertexBuffers[i].BindVertexBuffer(Gd, Cbs, (uint)i, ref _newState);
|
_vertexBuffers[i].BindVertexBuffer(Gd, Cbs, (uint)i, ref _newState, _vertexBufferUpdater);
|
||||||
|
|
||||||
_vertexBuffersDirty &= ~(1UL << i);
|
_vertexBuffersDirty &= ~(1UL << i);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
_vertexBufferUpdater.Commit(Cbs);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (_stateDirty || Pbp != pbp)
|
if (_stateDirty || Pbp != pbp)
|
||||||
@@ -1712,6 +1732,7 @@ namespace Ryujinx.Graphics.Vulkan
|
|||||||
_framebuffer?.Dispose();
|
_framebuffer?.Dispose();
|
||||||
_newState.Dispose();
|
_newState.Dispose();
|
||||||
_descriptorSetUpdater.Dispose();
|
_descriptorSetUpdater.Dispose();
|
||||||
|
_vertexBufferUpdater.Dispose();
|
||||||
|
|
||||||
for (int i = 0; i < _vertexBuffers.Length; i++)
|
for (int i = 0; i < _vertexBuffers.Length; i++)
|
||||||
{
|
{
|
||||||
|
@@ -46,7 +46,7 @@ namespace Ryujinx.Graphics.Vulkan
|
|||||||
AttributeScalarAlignment = 1;
|
AttributeScalarAlignment = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void BindVertexBuffer(VulkanRenderer gd, CommandBufferScoped cbs, uint binding, ref PipelineState state)
|
public void BindVertexBuffer(VulkanRenderer gd, CommandBufferScoped cbs, uint binding, ref PipelineState state, VertexBufferUpdater updater)
|
||||||
{
|
{
|
||||||
var autoBuffer = _buffer;
|
var autoBuffer = _buffer;
|
||||||
|
|
||||||
@@ -65,21 +65,7 @@ namespace Ryujinx.Graphics.Vulkan
|
|||||||
|
|
||||||
var buffer = autoBuffer.Get(cbs, 0, newSize).Value;
|
var buffer = autoBuffer.Get(cbs, 0, newSize).Value;
|
||||||
|
|
||||||
if (gd.Capabilities.SupportsExtendedDynamicState)
|
updater.BindVertexBuffer(cbs, binding, buffer, 0, (ulong)newSize, (ulong)stride);
|
||||||
{
|
|
||||||
gd.ExtendedDynamicStateApi.CmdBindVertexBuffers2(
|
|
||||||
cbs.CommandBuffer,
|
|
||||||
binding,
|
|
||||||
1,
|
|
||||||
buffer,
|
|
||||||
0,
|
|
||||||
(ulong)newSize,
|
|
||||||
(ulong)stride);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
gd.Api.CmdBindVertexBuffers(cbs.CommandBuffer, binding, 1, buffer, 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
_buffer = autoBuffer;
|
_buffer = autoBuffer;
|
||||||
|
|
||||||
@@ -106,21 +92,7 @@ namespace Ryujinx.Graphics.Vulkan
|
|||||||
{
|
{
|
||||||
var buffer = autoBuffer.Get(cbs, _offset, _size).Value;
|
var buffer = autoBuffer.Get(cbs, _offset, _size).Value;
|
||||||
|
|
||||||
if (gd.Capabilities.SupportsExtendedDynamicState)
|
updater.BindVertexBuffer(cbs, binding, buffer, (ulong)_offset, (ulong)_size, (ulong)_stride);
|
||||||
{
|
|
||||||
gd.ExtendedDynamicStateApi.CmdBindVertexBuffers2(
|
|
||||||
cbs.CommandBuffer,
|
|
||||||
binding,
|
|
||||||
1,
|
|
||||||
buffer,
|
|
||||||
(ulong)_offset,
|
|
||||||
(ulong)_size,
|
|
||||||
(ulong)_stride);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
gd.Api.CmdBindVertexBuffers(cbs.CommandBuffer, binding, 1, buffer, (ulong)_offset);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -129,6 +101,11 @@ namespace Ryujinx.Graphics.Vulkan
|
|||||||
return _buffer == buffer;
|
return _buffer == buffer;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public bool Matches(Auto<DisposableBuffer> buffer, int descriptorIndex, int offset, int size, int stride = 0)
|
||||||
|
{
|
||||||
|
return _buffer == buffer && DescriptorIndex == descriptorIndex && _offset == offset && _size == size && _stride == stride;
|
||||||
|
}
|
||||||
|
|
||||||
public void Swap(Auto<DisposableBuffer> from, Auto<DisposableBuffer> to)
|
public void Swap(Auto<DisposableBuffer> from, Auto<DisposableBuffer> to)
|
||||||
{
|
{
|
||||||
if (_buffer == from)
|
if (_buffer == from)
|
||||||
|
84
src/Ryujinx.Graphics.Vulkan/VertexBufferUpdater.cs
Normal file
84
src/Ryujinx.Graphics.Vulkan/VertexBufferUpdater.cs
Normal file
@@ -0,0 +1,84 @@
|
|||||||
|
using Silk.NET.Vulkan;
|
||||||
|
using System;
|
||||||
|
|
||||||
|
using VkBuffer = Silk.NET.Vulkan.Buffer;
|
||||||
|
|
||||||
|
namespace Ryujinx.Graphics.Vulkan
|
||||||
|
{
|
||||||
|
internal class VertexBufferUpdater : IDisposable
|
||||||
|
{
|
||||||
|
private VulkanRenderer _gd;
|
||||||
|
|
||||||
|
private uint _baseBinding;
|
||||||
|
private uint _count;
|
||||||
|
|
||||||
|
private NativeArray<VkBuffer> _buffers;
|
||||||
|
private NativeArray<ulong> _offsets;
|
||||||
|
private NativeArray<ulong> _sizes;
|
||||||
|
private NativeArray<ulong> _strides;
|
||||||
|
|
||||||
|
public VertexBufferUpdater(VulkanRenderer gd)
|
||||||
|
{
|
||||||
|
_gd = gd;
|
||||||
|
|
||||||
|
_buffers = new NativeArray<VkBuffer>(Constants.MaxVertexBuffers);
|
||||||
|
_offsets = new NativeArray<ulong>(Constants.MaxVertexBuffers);
|
||||||
|
_sizes = new NativeArray<ulong>(Constants.MaxVertexBuffers);
|
||||||
|
_strides = new NativeArray<ulong>(Constants.MaxVertexBuffers);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void BindVertexBuffer(CommandBufferScoped cbs, uint binding, VkBuffer buffer, ulong offset, ulong size, ulong stride)
|
||||||
|
{
|
||||||
|
if (_count == 0)
|
||||||
|
{
|
||||||
|
_baseBinding = binding;
|
||||||
|
}
|
||||||
|
else if (_baseBinding + _count != binding)
|
||||||
|
{
|
||||||
|
Commit(cbs);
|
||||||
|
_baseBinding = binding;
|
||||||
|
}
|
||||||
|
|
||||||
|
int index = (int)_count;
|
||||||
|
|
||||||
|
_buffers[index] = buffer;
|
||||||
|
_offsets[index] = offset;
|
||||||
|
_sizes[index] = size;
|
||||||
|
_strides[index] = stride;
|
||||||
|
|
||||||
|
_count++;
|
||||||
|
}
|
||||||
|
|
||||||
|
public unsafe void Commit(CommandBufferScoped cbs)
|
||||||
|
{
|
||||||
|
if (_count != 0)
|
||||||
|
{
|
||||||
|
if (_gd.Capabilities.SupportsExtendedDynamicState)
|
||||||
|
{
|
||||||
|
_gd.ExtendedDynamicStateApi.CmdBindVertexBuffers2(
|
||||||
|
cbs.CommandBuffer,
|
||||||
|
_baseBinding,
|
||||||
|
_count,
|
||||||
|
_buffers.Pointer,
|
||||||
|
_offsets.Pointer,
|
||||||
|
_sizes.Pointer,
|
||||||
|
_strides.Pointer);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
_gd.Api.CmdBindVertexBuffers(cbs.CommandBuffer, _baseBinding, _count, _buffers.Pointer, _offsets.Pointer);
|
||||||
|
}
|
||||||
|
|
||||||
|
_count = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Dispose()
|
||||||
|
{
|
||||||
|
_buffers.Dispose();
|
||||||
|
_offsets.Dispose();
|
||||||
|
_sizes.Dispose();
|
||||||
|
_strides.Dispose();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@@ -200,9 +200,10 @@ namespace Ryujinx.HLE.HOS
|
|||||||
|
|
||||||
LibHacHorizonManager = device.Configuration.LibHacHorizonManager;
|
LibHacHorizonManager = device.Configuration.LibHacHorizonManager;
|
||||||
|
|
||||||
|
// We hardcode a clock source id to avoid it changing between each start.
|
||||||
// TODO: use set:sys (and get external clock source id from settings)
|
// TODO: use set:sys (and get external clock source id from settings)
|
||||||
// TODO: use "time!standard_steady_clock_rtc_update_interval_minutes" and implement a worker thread to be accurate.
|
// TODO: use "time!standard_steady_clock_rtc_update_interval_minutes" and implement a worker thread to be accurate.
|
||||||
UInt128 clockSourceId = UInt128Utils.CreateRandom();
|
UInt128 clockSourceId = new UInt128(0x36a0328702ce8bc1, 0x1608eaba02333284);
|
||||||
IRtcManager.GetExternalRtcValue(out ulong rtcValue);
|
IRtcManager.GetExternalRtcValue(out ulong rtcValue);
|
||||||
|
|
||||||
// We assume the rtc is system time.
|
// We assume the rtc is system time.
|
||||||
@@ -222,22 +223,22 @@ namespace Ryujinx.HLE.HOS
|
|||||||
internalOffset = internalOffset.AddSeconds(-3600L);
|
internalOffset = internalOffset.AddSeconds(-3600L);
|
||||||
}
|
}
|
||||||
|
|
||||||
internalOffset = new TimeSpanType(-internalOffset.NanoSeconds);
|
systemTime = new TimeSpanType(systemTime.NanoSeconds + internalOffset.NanoSeconds);
|
||||||
|
|
||||||
// First init the standard steady clock
|
// First init the standard steady clock
|
||||||
TimeServiceManager.Instance.SetupStandardSteadyClock(TickSource, clockSourceId, systemTime, internalOffset, TimeSpanType.Zero, false);
|
TimeServiceManager.Instance.SetupStandardSteadyClock(TickSource, clockSourceId, TimeSpanType.Zero, TimeSpanType.Zero, TimeSpanType.Zero, false);
|
||||||
TimeServiceManager.Instance.SetupStandardLocalSystemClock(TickSource, new SystemClockContext(), systemTime.ToSeconds());
|
TimeServiceManager.Instance.SetupStandardLocalSystemClock(TickSource, new SystemClockContext(), systemTime.ToSeconds());
|
||||||
|
TimeServiceManager.Instance.StandardLocalSystemClock.GetClockContext(TickSource, out SystemClockContext localSytemClockContext);
|
||||||
|
|
||||||
if (NxSettings.Settings.TryGetValue("time!standard_network_clock_sufficient_accuracy_minutes", out object standardNetworkClockSufficientAccuracyMinutes))
|
if (NxSettings.Settings.TryGetValue("time!standard_network_clock_sufficient_accuracy_minutes", out object standardNetworkClockSufficientAccuracyMinutes))
|
||||||
{
|
{
|
||||||
TimeSpanType standardNetworkClockSufficientAccuracy = new TimeSpanType((int)standardNetworkClockSufficientAccuracyMinutes * 60000000000);
|
TimeSpanType standardNetworkClockSufficientAccuracy = new TimeSpanType((int)standardNetworkClockSufficientAccuracyMinutes * 60000000000);
|
||||||
|
|
||||||
// The network system clock needs a valid system clock, as such we setup this system clock using the local system clock.
|
// The network system clock needs a valid system clock, as such we setup this system clock using the local system clock.
|
||||||
TimeServiceManager.Instance.StandardLocalSystemClock.GetClockContext(TickSource, out SystemClockContext localSytemClockContext);
|
|
||||||
TimeServiceManager.Instance.SetupStandardNetworkSystemClock(localSytemClockContext, standardNetworkClockSufficientAccuracy);
|
TimeServiceManager.Instance.SetupStandardNetworkSystemClock(localSytemClockContext, standardNetworkClockSufficientAccuracy);
|
||||||
}
|
}
|
||||||
|
|
||||||
TimeServiceManager.Instance.SetupStandardUserSystemClock(TickSource, false, SteadyClockTimePoint.GetRandom());
|
TimeServiceManager.Instance.SetupStandardUserSystemClock(TickSource, true, localSytemClockContext.SteadyTimePoint);
|
||||||
|
|
||||||
// FIXME: TimeZone should be init here but it's actually done in ContentManager
|
// FIXME: TimeZone should be init here but it's actually done in ContentManager
|
||||||
|
|
||||||
|
@@ -89,7 +89,7 @@ namespace Ryujinx.HLE.HOS
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Title independent mods
|
// Title independent mods
|
||||||
public class PatchCache
|
private class PatchCache
|
||||||
{
|
{
|
||||||
public List<Mod<DirectoryInfo>> NsoPatches { get; }
|
public List<Mod<DirectoryInfo>> NsoPatches { get; }
|
||||||
public List<Mod<DirectoryInfo>> NroPatches { get; }
|
public List<Mod<DirectoryInfo>> NroPatches { get; }
|
||||||
@@ -107,14 +107,14 @@ namespace Ryujinx.HLE.HOS
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public Dictionary<ulong, ModCache> AppMods; // key is TitleId
|
private readonly Dictionary<ulong, ModCache> _appMods; // key is TitleId
|
||||||
public PatchCache Patches;
|
private PatchCache _patches;
|
||||||
|
|
||||||
private static readonly EnumerationOptions _dirEnumOptions;
|
private static readonly EnumerationOptions DirEnumOptions;
|
||||||
|
|
||||||
static ModLoader()
|
static ModLoader()
|
||||||
{
|
{
|
||||||
_dirEnumOptions = new EnumerationOptions
|
DirEnumOptions = new EnumerationOptions
|
||||||
{
|
{
|
||||||
MatchCasing = MatchCasing.CaseInsensitive,
|
MatchCasing = MatchCasing.CaseInsensitive,
|
||||||
MatchType = MatchType.Simple,
|
MatchType = MatchType.Simple,
|
||||||
@@ -125,37 +125,73 @@ namespace Ryujinx.HLE.HOS
|
|||||||
|
|
||||||
public ModLoader()
|
public ModLoader()
|
||||||
{
|
{
|
||||||
AppMods = new Dictionary<ulong, ModCache>();
|
_appMods = new Dictionary<ulong, ModCache>();
|
||||||
Patches = new PatchCache();
|
_patches = new PatchCache();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Clear()
|
private void Clear()
|
||||||
{
|
{
|
||||||
AppMods.Clear();
|
_appMods.Clear();
|
||||||
Patches = new PatchCache();
|
_patches = new PatchCache();
|
||||||
}
|
}
|
||||||
|
|
||||||
private static bool StrEquals(string s1, string s2) => string.Equals(s1, s2, StringComparison.OrdinalIgnoreCase);
|
private static bool StrEquals(string s1, string s2) => string.Equals(s1, s2, StringComparison.OrdinalIgnoreCase);
|
||||||
|
|
||||||
public string GetModsBasePath() => EnsureBaseDirStructure(AppDataManager.GetModsPath());
|
public static string GetModsBasePath() => EnsureBaseDirStructure(AppDataManager.GetModsPath());
|
||||||
public string GetSdModsBasePath() => EnsureBaseDirStructure(AppDataManager.GetSdModsPath());
|
public static string GetSdModsBasePath() => EnsureBaseDirStructure(AppDataManager.GetSdModsPath());
|
||||||
|
|
||||||
private string EnsureBaseDirStructure(string modsBasePath)
|
private static string EnsureBaseDirStructure(string modsBasePath)
|
||||||
{
|
{
|
||||||
var modsDir = new DirectoryInfo(modsBasePath);
|
var modsDir = new DirectoryInfo(modsBasePath);
|
||||||
|
|
||||||
modsDir.CreateSubdirectory(AmsContentsDir);
|
modsDir.CreateSubdirectory(AmsContentsDir);
|
||||||
modsDir.CreateSubdirectory(AmsNsoPatchDir);
|
modsDir.CreateSubdirectory(AmsNsoPatchDir);
|
||||||
modsDir.CreateSubdirectory(AmsNroPatchDir);
|
modsDir.CreateSubdirectory(AmsNroPatchDir);
|
||||||
// modsDir.CreateSubdirectory(AmsKipPatchDir); // uncomment when KIPs are supported
|
// TODO: uncomment when KIPs are supported
|
||||||
|
// modsDir.CreateSubdirectory(AmsKipPatchDir);
|
||||||
|
|
||||||
return modsDir.FullName;
|
return modsDir.FullName;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static DirectoryInfo FindTitleDir(DirectoryInfo contentsDir, string titleId)
|
private static DirectoryInfo FindTitleDir(DirectoryInfo contentsDir, string titleId)
|
||||||
=> contentsDir.EnumerateDirectories($"{titleId}*", _dirEnumOptions).FirstOrDefault();
|
=> contentsDir.EnumerateDirectories($"{titleId}*", DirEnumOptions).FirstOrDefault();
|
||||||
|
|
||||||
public string GetTitleDir(string modsBasePath, string titleId)
|
private static void AddModsFromDirectory(ModCache mods, DirectoryInfo dir, string titleId)
|
||||||
|
{
|
||||||
|
System.Text.StringBuilder types = new();
|
||||||
|
|
||||||
|
foreach (var modDir in dir.EnumerateDirectories())
|
||||||
|
{
|
||||||
|
types.Clear();
|
||||||
|
Mod<DirectoryInfo> mod = new("", null);
|
||||||
|
|
||||||
|
if (StrEquals(RomfsDir, modDir.Name))
|
||||||
|
{
|
||||||
|
mods.RomfsDirs.Add(mod = new Mod<DirectoryInfo>($"<{titleId} RomFs>", modDir));
|
||||||
|
types.Append('R');
|
||||||
|
}
|
||||||
|
else if (StrEquals(ExefsDir, modDir.Name))
|
||||||
|
{
|
||||||
|
mods.ExefsDirs.Add(mod = new Mod<DirectoryInfo>($"<{titleId} ExeFs>", modDir));
|
||||||
|
types.Append('E');
|
||||||
|
}
|
||||||
|
else if (StrEquals(CheatDir, modDir.Name))
|
||||||
|
{
|
||||||
|
types.Append('C', QueryCheatsDir(mods, modDir));
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
AddModsFromDirectory(mods, modDir, titleId);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (types.Length > 0)
|
||||||
|
{
|
||||||
|
Logger.Info?.Print(LogClass.ModLoader, $"Found mod '{mod.Name}' [{types}]");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static string GetTitleDir(string modsBasePath, string titleId)
|
||||||
{
|
{
|
||||||
var contentsDir = new DirectoryInfo(Path.Combine(modsBasePath, AmsContentsDir));
|
var contentsDir = new DirectoryInfo(Path.Combine(modsBasePath, AmsContentsDir));
|
||||||
var titleModsPath = FindTitleDir(contentsDir, titleId);
|
var titleModsPath = FindTitleDir(contentsDir, titleId);
|
||||||
@@ -170,17 +206,32 @@ namespace Ryujinx.HLE.HOS
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Static Query Methods
|
// Static Query Methods
|
||||||
public static void QueryPatchDirs(PatchCache cache, DirectoryInfo patchDir)
|
private static void QueryPatchDirs(PatchCache cache, DirectoryInfo patchDir)
|
||||||
{
|
{
|
||||||
if (cache.Initialized || !patchDir.Exists) return;
|
if (cache.Initialized || !patchDir.Exists)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
var patches = cache.KipPatches;
|
List<Mod<DirectoryInfo>> patches;
|
||||||
string type = null;
|
string type;
|
||||||
|
|
||||||
if (StrEquals(AmsNsoPatchDir, patchDir.Name)) { patches = cache.NsoPatches; type = "NSO"; }
|
if (StrEquals(AmsNsoPatchDir, patchDir.Name))
|
||||||
else if (StrEquals(AmsNroPatchDir, patchDir.Name)) { patches = cache.NroPatches; type = "NRO"; }
|
{
|
||||||
else if (StrEquals(AmsKipPatchDir, patchDir.Name)) { patches = cache.KipPatches; type = "KIP"; }
|
patches = cache.NsoPatches; type = "NSO";
|
||||||
else return;
|
}
|
||||||
|
else if (StrEquals(AmsNroPatchDir, patchDir.Name))
|
||||||
|
{
|
||||||
|
patches = cache.NroPatches; type = "NRO";
|
||||||
|
}
|
||||||
|
else if (StrEquals(AmsKipPatchDir, patchDir.Name))
|
||||||
|
{
|
||||||
|
patches = cache.KipPatches; type = "KIP";
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
foreach (var modDir in patchDir.EnumerateDirectories())
|
foreach (var modDir in patchDir.EnumerateDirectories())
|
||||||
{
|
{
|
||||||
@@ -189,9 +240,12 @@ namespace Ryujinx.HLE.HOS
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void QueryTitleDir(ModCache mods, DirectoryInfo titleDir)
|
private static void QueryTitleDir(ModCache mods, DirectoryInfo titleDir)
|
||||||
{
|
{
|
||||||
if (!titleDir.Exists) return;
|
if (!titleDir.Exists)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
var fsFile = new FileInfo(Path.Combine(titleDir.FullName, RomfsContainer));
|
var fsFile = new FileInfo(Path.Combine(titleDir.FullName, RomfsContainer));
|
||||||
if (fsFile.Exists)
|
if (fsFile.Exists)
|
||||||
@@ -205,64 +259,15 @@ namespace Ryujinx.HLE.HOS
|
|||||||
mods.ExefsContainers.Add(new Mod<FileInfo>($"<{titleDir.Name} ExeFs>", fsFile));
|
mods.ExefsContainers.Add(new Mod<FileInfo>($"<{titleDir.Name} ExeFs>", fsFile));
|
||||||
}
|
}
|
||||||
|
|
||||||
System.Text.StringBuilder types = new System.Text.StringBuilder(5);
|
AddModsFromDirectory(mods, titleDir, titleDir.Name);
|
||||||
|
|
||||||
foreach (var modDir in titleDir.EnumerateDirectories())
|
|
||||||
{
|
|
||||||
types.Clear();
|
|
||||||
Mod<DirectoryInfo> mod = new Mod<DirectoryInfo>("", null);
|
|
||||||
|
|
||||||
if (StrEquals(RomfsDir, modDir.Name))
|
|
||||||
{
|
|
||||||
mods.RomfsDirs.Add(mod = new Mod<DirectoryInfo>($"<{titleDir.Name} RomFs>", modDir));
|
|
||||||
types.Append('R');
|
|
||||||
}
|
|
||||||
else if (StrEquals(ExefsDir, modDir.Name))
|
|
||||||
{
|
|
||||||
mods.ExefsDirs.Add(mod = new Mod<DirectoryInfo>($"<{titleDir.Name} ExeFs>", modDir));
|
|
||||||
types.Append('E');
|
|
||||||
}
|
|
||||||
else if (StrEquals(CheatDir, modDir.Name))
|
|
||||||
{
|
|
||||||
for (int i = 0; i < QueryCheatsDir(mods, modDir); i++)
|
|
||||||
{
|
|
||||||
types.Append('C');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
var romfs = new DirectoryInfo(Path.Combine(modDir.FullName, RomfsDir));
|
|
||||||
var exefs = new DirectoryInfo(Path.Combine(modDir.FullName, ExefsDir));
|
|
||||||
var cheat = new DirectoryInfo(Path.Combine(modDir.FullName, CheatDir));
|
|
||||||
|
|
||||||
if (romfs.Exists)
|
|
||||||
{
|
|
||||||
mods.RomfsDirs.Add(mod = new Mod<DirectoryInfo>(modDir.Name, romfs));
|
|
||||||
types.Append('R');
|
|
||||||
}
|
|
||||||
|
|
||||||
if (exefs.Exists)
|
|
||||||
{
|
|
||||||
mods.ExefsDirs.Add(mod = new Mod<DirectoryInfo>(modDir.Name, exefs));
|
|
||||||
types.Append('E');
|
|
||||||
}
|
|
||||||
|
|
||||||
if (cheat.Exists)
|
|
||||||
{
|
|
||||||
for (int i = 0; i < QueryCheatsDir(mods, cheat); i++)
|
|
||||||
{
|
|
||||||
types.Append('C');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (types.Length > 0) Logger.Info?.Print(LogClass.ModLoader, $"Found mod '{mod.Name}' [{types}]");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void QueryContentsDir(ModCache mods, DirectoryInfo contentsDir, ulong titleId)
|
public static void QueryContentsDir(ModCache mods, DirectoryInfo contentsDir, ulong titleId)
|
||||||
{
|
{
|
||||||
if (!contentsDir.Exists) return;
|
if (!contentsDir.Exists)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
Logger.Info?.Print(LogClass.ModLoader, $"Searching mods for {((titleId & 0x1000) != 0 ? "DLC" : "Title")} {titleId:X16}");
|
Logger.Info?.Print(LogClass.ModLoader, $"Searching mods for {((titleId & 0x1000) != 0 ? "DLC" : "Title")} {titleId:X16}");
|
||||||
|
|
||||||
@@ -302,9 +307,16 @@ namespace Ryujinx.HLE.HOS
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int oldCheatsCount = mods.Cheats.Count;
|
||||||
|
|
||||||
// A cheat file can contain several cheats for the same executable, so the file must be parsed in
|
// A cheat file can contain several cheats for the same executable, so the file must be parsed in
|
||||||
// order to properly enumerate them.
|
// order to properly enumerate them.
|
||||||
mods.Cheats.AddRange(GetCheatsInFile(file));
|
mods.Cheats.AddRange(GetCheatsInFile(file));
|
||||||
|
|
||||||
|
if (mods.Cheats.Count - oldCheatsCount > 0)
|
||||||
|
{
|
||||||
|
numMods++;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return numMods;
|
return numMods;
|
||||||
@@ -313,13 +325,11 @@ namespace Ryujinx.HLE.HOS
|
|||||||
private static IEnumerable<Cheat> GetCheatsInFile(FileInfo cheatFile)
|
private static IEnumerable<Cheat> GetCheatsInFile(FileInfo cheatFile)
|
||||||
{
|
{
|
||||||
string cheatName = DefaultCheatName;
|
string cheatName = DefaultCheatName;
|
||||||
List<string> instructions = new List<string>();
|
List<string> instructions = new();
|
||||||
List<Cheat> cheats = new List<Cheat>();
|
List<Cheat> cheats = new();
|
||||||
|
|
||||||
using (StreamReader cheatData = cheatFile.OpenText())
|
using StreamReader cheatData = cheatFile.OpenText();
|
||||||
{
|
while (cheatData.ReadLine() is { } line)
|
||||||
string line;
|
|
||||||
while ((line = cheatData.ReadLine()) != null)
|
|
||||||
{
|
{
|
||||||
line = line.Trim();
|
line = line.Trim();
|
||||||
|
|
||||||
@@ -332,11 +342,11 @@ namespace Ryujinx.HLE.HOS
|
|||||||
|
|
||||||
Logger.Warning?.Print(LogClass.ModLoader, $"Ignoring cheat '{cheatFile.FullName}' because it is malformed");
|
Logger.Warning?.Print(LogClass.ModLoader, $"Ignoring cheat '{cheatFile.FullName}' because it is malformed");
|
||||||
|
|
||||||
return new List<Cheat>();
|
return Array.Empty<Cheat>();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Add the previous section to the list.
|
// Add the previous section to the list.
|
||||||
if (instructions.Count != 0)
|
if (instructions.Count > 0)
|
||||||
{
|
{
|
||||||
cheats.Add(new Cheat($"<{cheatName} Cheat>", cheatFile, instructions));
|
cheats.Add(new Cheat($"<{cheatName} Cheat>", cheatFile, instructions));
|
||||||
}
|
}
|
||||||
@@ -353,17 +363,16 @@ namespace Ryujinx.HLE.HOS
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Add the last section being processed.
|
// Add the last section being processed.
|
||||||
if (instructions.Count != 0)
|
if (instructions.Count > 0)
|
||||||
{
|
{
|
||||||
cheats.Add(new Cheat($"<{cheatName} Cheat>", cheatFile, instructions));
|
cheats.Add(new Cheat($"<{cheatName} Cheat>", cheatFile, instructions));
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
return cheats;
|
return cheats;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Assumes searchDirPaths don't overlap
|
// Assumes searchDirPaths don't overlap
|
||||||
public static void CollectMods(Dictionary<ulong, ModCache> modCaches, PatchCache patches, params string[] searchDirPaths)
|
private static void CollectMods(Dictionary<ulong, ModCache> modCaches, PatchCache patches, params string[] searchDirPaths)
|
||||||
{
|
{
|
||||||
static bool IsPatchesDir(string name) => StrEquals(AmsNsoPatchDir, name) ||
|
static bool IsPatchesDir(string name) => StrEquals(AmsNsoPatchDir, name) ||
|
||||||
StrEquals(AmsNroPatchDir, name) ||
|
StrEquals(AmsNroPatchDir, name) ||
|
||||||
@@ -375,7 +384,7 @@ namespace Ryujinx.HLE.HOS
|
|||||||
{
|
{
|
||||||
if (IsContentsDir(searchDir.Name))
|
if (IsContentsDir(searchDir.Name))
|
||||||
{
|
{
|
||||||
foreach (var (titleId, cache) in modCaches)
|
foreach ((ulong titleId, ModCache cache) in modCaches)
|
||||||
{
|
{
|
||||||
QueryContentsDir(cache, searchDir, titleId);
|
QueryContentsDir(cache, searchDir, titleId);
|
||||||
}
|
}
|
||||||
@@ -419,15 +428,15 @@ namespace Ryujinx.HLE.HOS
|
|||||||
|
|
||||||
foreach (ulong titleId in titles)
|
foreach (ulong titleId in titles)
|
||||||
{
|
{
|
||||||
AppMods[titleId] = new ModCache();
|
_appMods[titleId] = new ModCache();
|
||||||
}
|
}
|
||||||
|
|
||||||
CollectMods(AppMods, Patches, searchDirPaths);
|
CollectMods(_appMods, _patches, searchDirPaths);
|
||||||
}
|
}
|
||||||
|
|
||||||
internal IStorage ApplyRomFsMods(ulong titleId, IStorage baseStorage)
|
internal IStorage ApplyRomFsMods(ulong titleId, IStorage baseStorage)
|
||||||
{
|
{
|
||||||
if (!AppMods.TryGetValue(titleId, out ModCache mods) || mods.RomfsDirs.Count + mods.RomfsContainers.Count == 0)
|
if (!_appMods.TryGetValue(titleId, out ModCache mods) || mods.RomfsDirs.Count + mods.RomfsContainers.Count == 0)
|
||||||
{
|
{
|
||||||
return baseStorage;
|
return baseStorage;
|
||||||
}
|
}
|
||||||
@@ -487,7 +496,7 @@ namespace Ryujinx.HLE.HOS
|
|||||||
return newStorage;
|
return newStorage;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void AddFiles(IFileSystem fs, string modName, HashSet<string> fileSet, RomFsBuilder builder)
|
private static void AddFiles(IFileSystem fs, string modName, ISet<string> fileSet, RomFsBuilder builder)
|
||||||
{
|
{
|
||||||
foreach (var entry in fs.EnumerateEntries()
|
foreach (var entry in fs.EnumerateEntries()
|
||||||
.Where(f => f.Type == DirectoryEntryType.File)
|
.Where(f => f.Type == DirectoryEntryType.File)
|
||||||
@@ -509,7 +518,7 @@ namespace Ryujinx.HLE.HOS
|
|||||||
|
|
||||||
internal bool ReplaceExefsPartition(ulong titleId, ref IFileSystem exefs)
|
internal bool ReplaceExefsPartition(ulong titleId, ref IFileSystem exefs)
|
||||||
{
|
{
|
||||||
if (!AppMods.TryGetValue(titleId, out ModCache mods) || mods.ExefsContainers.Count == 0)
|
if (!_appMods.TryGetValue(titleId, out ModCache mods) || mods.ExefsContainers.Count == 0)
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@@ -537,13 +546,13 @@ namespace Ryujinx.HLE.HOS
|
|||||||
|
|
||||||
internal ModLoadResult ApplyExefsMods(ulong titleId, NsoExecutable[] nsos)
|
internal ModLoadResult ApplyExefsMods(ulong titleId, NsoExecutable[] nsos)
|
||||||
{
|
{
|
||||||
ModLoadResult modLoadResult = new ModLoadResult
|
ModLoadResult modLoadResult = new()
|
||||||
{
|
{
|
||||||
Stubs = new BitVector32(),
|
Stubs = new BitVector32(),
|
||||||
Replaces = new BitVector32()
|
Replaces = new BitVector32()
|
||||||
};
|
};
|
||||||
|
|
||||||
if (!AppMods.TryGetValue(titleId, out ModCache mods) || mods.ExefsDirs.Count == 0)
|
if (!_appMods.TryGetValue(titleId, out ModCache mods) || mods.ExefsDirs.Count == 0)
|
||||||
{
|
{
|
||||||
return modLoadResult;
|
return modLoadResult;
|
||||||
}
|
}
|
||||||
@@ -561,7 +570,7 @@ namespace Ryujinx.HLE.HOS
|
|||||||
{
|
{
|
||||||
var nsoName = ProcessConst.ExeFsPrefixes[i];
|
var nsoName = ProcessConst.ExeFsPrefixes[i];
|
||||||
|
|
||||||
FileInfo nsoFile = new FileInfo(Path.Combine(mod.Path.FullName, nsoName));
|
FileInfo nsoFile = new(Path.Combine(mod.Path.FullName, nsoName));
|
||||||
if (nsoFile.Exists)
|
if (nsoFile.Exists)
|
||||||
{
|
{
|
||||||
if (modLoadResult.Replaces[1 << i])
|
if (modLoadResult.Replaces[1 << i])
|
||||||
@@ -580,7 +589,7 @@ namespace Ryujinx.HLE.HOS
|
|||||||
modLoadResult.Stubs[1 << i] |= File.Exists(Path.Combine(mod.Path.FullName, nsoName + StubExtension));
|
modLoadResult.Stubs[1 << i] |= File.Exists(Path.Combine(mod.Path.FullName, nsoName + StubExtension));
|
||||||
}
|
}
|
||||||
|
|
||||||
FileInfo npdmFile = new FileInfo(Path.Combine(mod.Path.FullName, "main.npdm"));
|
FileInfo npdmFile = new(Path.Combine(mod.Path.FullName, "main.npdm"));
|
||||||
if (npdmFile.Exists)
|
if (npdmFile.Exists)
|
||||||
{
|
{
|
||||||
if (modLoadResult.Npdm != null)
|
if (modLoadResult.Npdm != null)
|
||||||
@@ -611,7 +620,7 @@ namespace Ryujinx.HLE.HOS
|
|||||||
|
|
||||||
internal void ApplyNroPatches(NroExecutable nro)
|
internal void ApplyNroPatches(NroExecutable nro)
|
||||||
{
|
{
|
||||||
var nroPatches = Patches.NroPatches;
|
var nroPatches = _patches.NroPatches;
|
||||||
|
|
||||||
if (nroPatches.Count == 0) return;
|
if (nroPatches.Count == 0) return;
|
||||||
|
|
||||||
@@ -622,9 +631,9 @@ namespace Ryujinx.HLE.HOS
|
|||||||
|
|
||||||
internal bool ApplyNsoPatches(ulong titleId, params IExecutable[] programs)
|
internal bool ApplyNsoPatches(ulong titleId, params IExecutable[] programs)
|
||||||
{
|
{
|
||||||
IEnumerable<Mod<DirectoryInfo>> nsoMods = Patches.NsoPatches;
|
IEnumerable<Mod<DirectoryInfo>> nsoMods = _patches.NsoPatches;
|
||||||
|
|
||||||
if (AppMods.TryGetValue(titleId, out ModCache mods))
|
if (_appMods.TryGetValue(titleId, out ModCache mods))
|
||||||
{
|
{
|
||||||
nsoMods = nsoMods.Concat(mods.ExefsDirs);
|
nsoMods = nsoMods.Concat(mods.ExefsDirs);
|
||||||
}
|
}
|
||||||
@@ -636,7 +645,7 @@ namespace Ryujinx.HLE.HOS
|
|||||||
|
|
||||||
internal void LoadCheats(ulong titleId, ProcessTamperInfo tamperInfo, TamperMachine tamperMachine)
|
internal void LoadCheats(ulong titleId, ProcessTamperInfo tamperInfo, TamperMachine tamperMachine)
|
||||||
{
|
{
|
||||||
if (tamperInfo == null || tamperInfo.BuildIds == null || tamperInfo.CodeAddresses == null)
|
if (tamperInfo?.BuildIds == null || tamperInfo.CodeAddresses == null)
|
||||||
{
|
{
|
||||||
Logger.Error?.Print(LogClass.ModLoader, "Unable to install cheat because the associated process is invalid");
|
Logger.Error?.Print(LogClass.ModLoader, "Unable to install cheat because the associated process is invalid");
|
||||||
|
|
||||||
@@ -645,14 +654,14 @@ namespace Ryujinx.HLE.HOS
|
|||||||
|
|
||||||
Logger.Info?.Print(LogClass.ModLoader, $"Build ids found for title {titleId:X16}:\n {String.Join("\n ", tamperInfo.BuildIds)}");
|
Logger.Info?.Print(LogClass.ModLoader, $"Build ids found for title {titleId:X16}:\n {String.Join("\n ", tamperInfo.BuildIds)}");
|
||||||
|
|
||||||
if (!AppMods.TryGetValue(titleId, out ModCache mods) || mods.Cheats.Count == 0)
|
if (!_appMods.TryGetValue(titleId, out ModCache mods) || mods.Cheats.Count == 0)
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
var cheats = mods.Cheats;
|
var cheats = mods.Cheats;
|
||||||
var processExes = tamperInfo.BuildIds.Zip(tamperInfo.CodeAddresses, (k, v) => new { k, v })
|
var processExes = tamperInfo.BuildIds.Zip(tamperInfo.CodeAddresses, (k, v) => new { k, v })
|
||||||
.ToDictionary(x => x.k.Substring(0, Math.Min(Cheat.CheatIdSize, x.k.Length)), x => x.v);
|
.ToDictionary(x => x.k[..Math.Min(Cheat.CheatIdSize, x.k.Length)], x => x.v);
|
||||||
|
|
||||||
foreach (var cheat in cheats)
|
foreach (var cheat in cheats)
|
||||||
{
|
{
|
||||||
|
@@ -92,6 +92,15 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService
|
|||||||
return ResultCode.Success;
|
return ResultCode.Success;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[CommandCmif(23)]
|
||||||
|
// GetAppletCommonFunctions() -> object<nn::am::service::IAppletCommonFunctions>
|
||||||
|
public ResultCode GetAppletCommonFunctions(ServiceCtx context)
|
||||||
|
{
|
||||||
|
MakeObject(context, new IAppletCommonFunctions());
|
||||||
|
|
||||||
|
return ResultCode.Success;
|
||||||
|
}
|
||||||
|
|
||||||
[CommandCmif(1000)]
|
[CommandCmif(1000)]
|
||||||
// GetDebugFunctions() -> object<nn::am::service::IDebugFunctions>
|
// GetDebugFunctions() -> object<nn::am::service::IDebugFunctions>
|
||||||
public ResultCode GetDebugFunctions(ServiceCtx context)
|
public ResultCode GetDebugFunctions(ServiceCtx context)
|
||||||
|
@@ -9,8 +9,10 @@ using System;
|
|||||||
|
|
||||||
namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.SystemAppletProxy
|
namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.SystemAppletProxy
|
||||||
{
|
{
|
||||||
class ICommonStateGetter : IpcService
|
class ICommonStateGetter : DisposableIpcService
|
||||||
{
|
{
|
||||||
|
private readonly ServiceCtx _context;
|
||||||
|
|
||||||
private Apm.ManagerServer _apmManagerServer;
|
private Apm.ManagerServer _apmManagerServer;
|
||||||
private Apm.SystemManagerServer _apmSystemManagerServer;
|
private Apm.SystemManagerServer _apmSystemManagerServer;
|
||||||
private Lbl.LblControllerServer _lblControllerServer;
|
private Lbl.LblControllerServer _lblControllerServer;
|
||||||
@@ -23,11 +25,18 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys
|
|||||||
private int _messageEventHandle;
|
private int _messageEventHandle;
|
||||||
private int _displayResolutionChangedEventHandle;
|
private int _displayResolutionChangedEventHandle;
|
||||||
|
|
||||||
|
private KEvent _acquiredSleepLockEvent;
|
||||||
|
private int _acquiredSleepLockEventHandle;
|
||||||
|
|
||||||
public ICommonStateGetter(ServiceCtx context)
|
public ICommonStateGetter(ServiceCtx context)
|
||||||
{
|
{
|
||||||
|
_context = context;
|
||||||
|
|
||||||
_apmManagerServer = new Apm.ManagerServer(context);
|
_apmManagerServer = new Apm.ManagerServer(context);
|
||||||
_apmSystemManagerServer = new Apm.SystemManagerServer(context);
|
_apmSystemManagerServer = new Apm.SystemManagerServer(context);
|
||||||
_lblControllerServer = new Lbl.LblControllerServer(context);
|
_lblControllerServer = new Lbl.LblControllerServer(context);
|
||||||
|
|
||||||
|
_acquiredSleepLockEvent = new KEvent(context.Device.System.KernelContext);
|
||||||
}
|
}
|
||||||
|
|
||||||
[CommandCmif(0)]
|
[CommandCmif(0)]
|
||||||
@@ -117,6 +126,34 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys
|
|||||||
return ResultCode.Success;
|
return ResultCode.Success;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[CommandCmif(10)]
|
||||||
|
// RequestToAcquireSleepLock()
|
||||||
|
public ResultCode RequestToAcquireSleepLock(ServiceCtx context)
|
||||||
|
{
|
||||||
|
Logger.Stub?.PrintStub(LogClass.ServiceAm);
|
||||||
|
|
||||||
|
return ResultCode.Success;
|
||||||
|
}
|
||||||
|
|
||||||
|
[CommandCmif(13)]
|
||||||
|
// GetAcquiredSleepLockEvent() -> handle<copy>
|
||||||
|
public ResultCode GetAcquiredSleepLockEvent(ServiceCtx context)
|
||||||
|
{
|
||||||
|
if (_acquiredSleepLockEventHandle == 0)
|
||||||
|
{
|
||||||
|
if (context.Process.HandleTable.GenerateHandle(_acquiredSleepLockEvent.ReadableEvent, out _acquiredSleepLockEventHandle) != Result.Success)
|
||||||
|
{
|
||||||
|
throw new InvalidOperationException("Out of handles!");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
context.Response.HandleDesc = IpcHandleDesc.MakeCopy(_acquiredSleepLockEventHandle);
|
||||||
|
|
||||||
|
Logger.Stub?.PrintStub(LogClass.ServiceAm);
|
||||||
|
|
||||||
|
return ResultCode.Success;
|
||||||
|
}
|
||||||
|
|
||||||
[CommandCmif(50)] // 3.0.0+
|
[CommandCmif(50)] // 3.0.0+
|
||||||
// IsVrModeEnabled() -> b8
|
// IsVrModeEnabled() -> b8
|
||||||
public ResultCode IsVrModeEnabled(ServiceCtx context)
|
public ResultCode IsVrModeEnabled(ServiceCtx context)
|
||||||
@@ -281,5 +318,17 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys
|
|||||||
|
|
||||||
return ResultCode.Success;
|
return ResultCode.Success;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
protected override void Dispose(bool isDisposing)
|
||||||
|
{
|
||||||
|
if (isDisposing)
|
||||||
|
{
|
||||||
|
if (_acquiredSleepLockEventHandle != 0)
|
||||||
|
{
|
||||||
|
_context.Process.HandleTable.CloseHandle(_acquiredSleepLockEventHandle);
|
||||||
|
_acquiredSleepLockEventHandle = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
@@ -0,0 +1,13 @@
|
|||||||
|
using System.Runtime.InteropServices;
|
||||||
|
|
||||||
|
namespace Ryujinx.HLE.HOS.Services.Time.Clock.Types
|
||||||
|
{
|
||||||
|
[StructLayout(LayoutKind.Sequential, Pack = 1)]
|
||||||
|
struct ContinuousAdjustmentTimePoint
|
||||||
|
{
|
||||||
|
public ulong ClockOffset;
|
||||||
|
public long Multiplier;
|
||||||
|
public long DivisorLog2;
|
||||||
|
public SystemClockContext Context;
|
||||||
|
}
|
||||||
|
}
|
@@ -1,8 +1,8 @@
|
|||||||
using Ryujinx.Cpu;
|
using Ryujinx.Cpu;
|
||||||
using Ryujinx.HLE.HOS.Kernel.Memory;
|
using Ryujinx.HLE.HOS.Kernel.Memory;
|
||||||
using Ryujinx.HLE.HOS.Services.Time.Clock;
|
using Ryujinx.HLE.HOS.Services.Time.Clock;
|
||||||
|
using Ryujinx.HLE.HOS.Services.Time.Clock.Types;
|
||||||
using Ryujinx.HLE.HOS.Services.Time.Types;
|
using Ryujinx.HLE.HOS.Services.Time.Types;
|
||||||
using Ryujinx.HLE.Utilities;
|
|
||||||
using System;
|
using System;
|
||||||
using System.Runtime.CompilerServices;
|
using System.Runtime.CompilerServices;
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
@@ -20,6 +20,7 @@ namespace Ryujinx.HLE.HOS.Services.Time
|
|||||||
private const uint LocalSystemClockContextOffset = 0x38;
|
private const uint LocalSystemClockContextOffset = 0x38;
|
||||||
private const uint NetworkSystemClockContextOffset = 0x80;
|
private const uint NetworkSystemClockContextOffset = 0x80;
|
||||||
private const uint AutomaticCorrectionEnabledOffset = 0xC8;
|
private const uint AutomaticCorrectionEnabledOffset = 0xC8;
|
||||||
|
private const uint ContinuousAdjustmentTimePointOffset = 0xD0;
|
||||||
|
|
||||||
public void Initialize(Switch device, KSharedMemory sharedMemory, SharedMemoryStorage timeSharedMemoryStorage, int timeSharedMemorySize)
|
public void Initialize(Switch device, KSharedMemory sharedMemory, SharedMemoryStorage timeSharedMemoryStorage, int timeSharedMemorySize)
|
||||||
{
|
{
|
||||||
@@ -39,15 +40,7 @@ namespace Ryujinx.HLE.HOS.Services.Time
|
|||||||
|
|
||||||
public void SetupStandardSteadyClock(ITickSource tickSource, UInt128 clockSourceId, TimeSpanType currentTimePoint)
|
public void SetupStandardSteadyClock(ITickSource tickSource, UInt128 clockSourceId, TimeSpanType currentTimePoint)
|
||||||
{
|
{
|
||||||
TimeSpanType ticksTimeSpan = TimeSpanType.FromTicks(tickSource.Counter, tickSource.Frequency);
|
UpdateSteadyClock(tickSource, clockSourceId, currentTimePoint);
|
||||||
|
|
||||||
SteadyClockContext context = new SteadyClockContext
|
|
||||||
{
|
|
||||||
InternalOffset = (ulong)(currentTimePoint.NanoSeconds - ticksTimeSpan.NanoSeconds),
|
|
||||||
ClockSourceId = clockSourceId
|
|
||||||
};
|
|
||||||
|
|
||||||
WriteObjectToSharedMemory(SteadyClockContextOffset, 4, context);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void SetAutomaticCorrectionEnabled(bool isAutomaticCorrectionEnabled)
|
public void SetAutomaticCorrectionEnabled(bool isAutomaticCorrectionEnabled)
|
||||||
@@ -59,9 +52,37 @@ namespace Ryujinx.HLE.HOS.Services.Time
|
|||||||
public void SetSteadyClockRawTimePoint(ITickSource tickSource, TimeSpanType currentTimePoint)
|
public void SetSteadyClockRawTimePoint(ITickSource tickSource, TimeSpanType currentTimePoint)
|
||||||
{
|
{
|
||||||
SteadyClockContext context = ReadObjectFromSharedMemory<SteadyClockContext>(SteadyClockContextOffset, 4);
|
SteadyClockContext context = ReadObjectFromSharedMemory<SteadyClockContext>(SteadyClockContextOffset, 4);
|
||||||
|
|
||||||
|
UpdateSteadyClock(tickSource, context.ClockSourceId, currentTimePoint);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void UpdateSteadyClock(ITickSource tickSource, UInt128 clockSourceId, TimeSpanType currentTimePoint)
|
||||||
|
{
|
||||||
TimeSpanType ticksTimeSpan = TimeSpanType.FromTicks(tickSource.Counter, tickSource.Frequency);
|
TimeSpanType ticksTimeSpan = TimeSpanType.FromTicks(tickSource.Counter, tickSource.Frequency);
|
||||||
|
|
||||||
context.InternalOffset = (ulong)(currentTimePoint.NanoSeconds - ticksTimeSpan.NanoSeconds);
|
ContinuousAdjustmentTimePoint adjustmentTimePoint = new ContinuousAdjustmentTimePoint
|
||||||
|
{
|
||||||
|
ClockOffset = (ulong)ticksTimeSpan.NanoSeconds,
|
||||||
|
Multiplier = 1,
|
||||||
|
DivisorLog2 = 0,
|
||||||
|
Context = new SystemClockContext
|
||||||
|
{
|
||||||
|
Offset = 0,
|
||||||
|
SteadyTimePoint = new SteadyClockTimePoint
|
||||||
|
{
|
||||||
|
ClockSourceId = clockSourceId,
|
||||||
|
TimePoint = 0
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
WriteObjectToSharedMemory(ContinuousAdjustmentTimePointOffset, 4, adjustmentTimePoint);
|
||||||
|
|
||||||
|
SteadyClockContext context = new SteadyClockContext
|
||||||
|
{
|
||||||
|
InternalOffset = (ulong)(currentTimePoint.NanoSeconds - ticksTimeSpan.NanoSeconds),
|
||||||
|
ClockSourceId = clockSourceId
|
||||||
|
};
|
||||||
|
|
||||||
WriteObjectToSharedMemory(SteadyClockContextOffset, 4, context);
|
WriteObjectToSharedMemory(SteadyClockContextOffset, 4, context);
|
||||||
}
|
}
|
||||||
|
@@ -116,7 +116,7 @@ namespace Ryujinx.HLE.Loaders.Processes.Extensions
|
|||||||
device,
|
device,
|
||||||
device.System.KernelContext,
|
device.System.KernelContext,
|
||||||
metaLoader,
|
metaLoader,
|
||||||
nacpData.Value,
|
nacpData,
|
||||||
enablePtc,
|
enablePtc,
|
||||||
allowCodeMemoryForJit,
|
allowCodeMemoryForJit,
|
||||||
programName,
|
programName,
|
||||||
|
@@ -2,6 +2,7 @@
|
|||||||
using LibHac.FsSystem;
|
using LibHac.FsSystem;
|
||||||
using LibHac.Loader;
|
using LibHac.Loader;
|
||||||
using LibHac.Ns;
|
using LibHac.Ns;
|
||||||
|
using Ryujinx.HLE.HOS;
|
||||||
using Ryujinx.HLE.Loaders.Processes.Extensions;
|
using Ryujinx.HLE.Loaders.Processes.Extensions;
|
||||||
using ApplicationId = LibHac.Ncm.ApplicationId;
|
using ApplicationId = LibHac.Ncm.ApplicationId;
|
||||||
|
|
||||||
@@ -17,8 +18,8 @@ namespace Ryujinx.HLE.Loaders.Processes
|
|||||||
|
|
||||||
device.Configuration.VirtualFileSystem.ModLoader.CollectMods(
|
device.Configuration.VirtualFileSystem.ModLoader.CollectMods(
|
||||||
new[] { programId },
|
new[] { programId },
|
||||||
device.Configuration.VirtualFileSystem.ModLoader.GetModsBasePath(),
|
ModLoader.GetModsBasePath(),
|
||||||
device.Configuration.VirtualFileSystem.ModLoader.GetSdModsBasePath());
|
ModLoader.GetSdModsBasePath());
|
||||||
|
|
||||||
if (programId != 0)
|
if (programId != 0)
|
||||||
{
|
{
|
||||||
|
@@ -8,6 +8,7 @@ using LibHac.Ns;
|
|||||||
using LibHac.Tools.FsSystem;
|
using LibHac.Tools.FsSystem;
|
||||||
using LibHac.Tools.FsSystem.NcaUtils;
|
using LibHac.Tools.FsSystem.NcaUtils;
|
||||||
using Ryujinx.Common.Logging;
|
using Ryujinx.Common.Logging;
|
||||||
|
using Ryujinx.HLE.HOS;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using ApplicationId = LibHac.Ncm.ApplicationId;
|
using ApplicationId = LibHac.Ncm.ApplicationId;
|
||||||
@@ -35,8 +36,8 @@ namespace Ryujinx.HLE.Loaders.Processes.Extensions
|
|||||||
// Collecting mods related to AocTitleIds and ProgramId.
|
// Collecting mods related to AocTitleIds and ProgramId.
|
||||||
device.Configuration.VirtualFileSystem.ModLoader.CollectMods(
|
device.Configuration.VirtualFileSystem.ModLoader.CollectMods(
|
||||||
device.Configuration.ContentManager.GetAocTitleIds().Prepend(metaLoader.GetProgramId()),
|
device.Configuration.ContentManager.GetAocTitleIds().Prepend(metaLoader.GetProgramId()),
|
||||||
device.Configuration.VirtualFileSystem.ModLoader.GetModsBasePath(),
|
ModLoader.GetModsBasePath(),
|
||||||
device.Configuration.VirtualFileSystem.ModLoader.GetSdModsBasePath());
|
ModLoader.GetSdModsBasePath());
|
||||||
|
|
||||||
// Load Nacp file.
|
// Load Nacp file.
|
||||||
var nacpData = new BlitStruct<ApplicationControlProperty>(1);
|
var nacpData = new BlitStruct<ApplicationControlProperty>(1);
|
||||||
|
@@ -209,7 +209,7 @@ namespace Ryujinx.HLE.Loaders.Processes
|
|||||||
ProcessResult processResult = ProcessLoaderHelper.LoadNsos(_device,
|
ProcessResult processResult = ProcessLoaderHelper.LoadNsos(_device,
|
||||||
_device.System.KernelContext,
|
_device.System.KernelContext,
|
||||||
dummyExeFs.GetNpdm(),
|
dummyExeFs.GetNpdm(),
|
||||||
nacpData.Value,
|
nacpData,
|
||||||
diskCacheEnabled: false,
|
diskCacheEnabled: false,
|
||||||
allowCodeMemoryForJit: true,
|
allowCodeMemoryForJit: true,
|
||||||
programName,
|
programName,
|
||||||
|
@@ -219,7 +219,7 @@ namespace Ryujinx.HLE.Loaders.Processes
|
|||||||
Switch device,
|
Switch device,
|
||||||
KernelContext context,
|
KernelContext context,
|
||||||
MetaLoader metaLoader,
|
MetaLoader metaLoader,
|
||||||
ApplicationControlProperty applicationControlProperties,
|
BlitStruct<ApplicationControlProperty> applicationControlProperties,
|
||||||
bool diskCacheEnabled,
|
bool diskCacheEnabled,
|
||||||
bool allowCodeMemoryForJit,
|
bool allowCodeMemoryForJit,
|
||||||
string name,
|
string name,
|
||||||
@@ -355,7 +355,7 @@ namespace Ryujinx.HLE.Loaders.Processes
|
|||||||
context.Device.System.TickSource,
|
context.Device.System.TickSource,
|
||||||
context.Device.Gpu,
|
context.Device.Gpu,
|
||||||
$"{programId:x16}",
|
$"{programId:x16}",
|
||||||
applicationControlProperties.DisplayVersionString.ToString(),
|
applicationControlProperties.Value.DisplayVersionString.ToString(),
|
||||||
diskCacheEnabled,
|
diskCacheEnabled,
|
||||||
codeStart,
|
codeStart,
|
||||||
codeSize);
|
codeSize);
|
||||||
|
@@ -1,4 +1,5 @@
|
|||||||
using LibHac.Loader;
|
using LibHac.Common;
|
||||||
|
using LibHac.Loader;
|
||||||
using LibHac.Ns;
|
using LibHac.Ns;
|
||||||
using Ryujinx.Common.Logging;
|
using Ryujinx.Common.Logging;
|
||||||
using Ryujinx.Cpu;
|
using Ryujinx.Cpu;
|
||||||
@@ -9,9 +10,9 @@ using System.Linq;
|
|||||||
|
|
||||||
namespace Ryujinx.HLE.Loaders.Processes
|
namespace Ryujinx.HLE.Loaders.Processes
|
||||||
{
|
{
|
||||||
public struct ProcessResult
|
public class ProcessResult
|
||||||
{
|
{
|
||||||
public static ProcessResult Failed => new(null, new ApplicationControlProperty(), false, false, null, 0, 0, 0, TitleLanguage.AmericanEnglish);
|
public static ProcessResult Failed => new(null, new BlitStruct<ApplicationControlProperty>(1), false, false, null, 0, 0, 0, TitleLanguage.AmericanEnglish);
|
||||||
|
|
||||||
private readonly byte _mainThreadPriority;
|
private readonly byte _mainThreadPriority;
|
||||||
private readonly uint _mainThreadStackSize;
|
private readonly uint _mainThreadStackSize;
|
||||||
@@ -32,7 +33,7 @@ namespace Ryujinx.HLE.Loaders.Processes
|
|||||||
|
|
||||||
public ProcessResult(
|
public ProcessResult(
|
||||||
MetaLoader metaLoader,
|
MetaLoader metaLoader,
|
||||||
ApplicationControlProperty applicationControlProperties,
|
BlitStruct<ApplicationControlProperty> applicationControlProperties,
|
||||||
bool diskCacheEnabled,
|
bool diskCacheEnabled,
|
||||||
bool allowCodeMemoryForJit,
|
bool allowCodeMemoryForJit,
|
||||||
IDiskCacheLoadState diskCacheLoadState,
|
IDiskCacheLoadState diskCacheLoadState,
|
||||||
@@ -48,7 +49,7 @@ namespace Ryujinx.HLE.Loaders.Processes
|
|||||||
ProcessId = pid;
|
ProcessId = pid;
|
||||||
|
|
||||||
MetaLoader = metaLoader;
|
MetaLoader = metaLoader;
|
||||||
ApplicationControlProperties = applicationControlProperties;
|
ApplicationControlProperties = applicationControlProperties.Value;
|
||||||
|
|
||||||
if (metaLoader is not null)
|
if (metaLoader is not null)
|
||||||
{
|
{
|
||||||
|
@@ -1,9 +0,0 @@
|
|||||||
namespace Ryujinx.Headless.SDL2
|
|
||||||
{
|
|
||||||
public enum HideCursor
|
|
||||||
{
|
|
||||||
Never,
|
|
||||||
OnIdle,
|
|
||||||
Always
|
|
||||||
}
|
|
||||||
}
|
|
@@ -107,8 +107,8 @@ namespace Ryujinx.Headless.SDL2.OpenGL
|
|||||||
GraphicsDebugLevel glLogLevel,
|
GraphicsDebugLevel glLogLevel,
|
||||||
AspectRatio aspectRatio,
|
AspectRatio aspectRatio,
|
||||||
bool enableMouse,
|
bool enableMouse,
|
||||||
HideCursor hideCursor)
|
HideCursorMode hideCursorMode)
|
||||||
: base(inputManager, glLogLevel, aspectRatio, enableMouse, hideCursor)
|
: base(inputManager, glLogLevel, aspectRatio, enableMouse, hideCursorMode)
|
||||||
{
|
{
|
||||||
_glLogLevel = glLogLevel;
|
_glLogLevel = glLogLevel;
|
||||||
}
|
}
|
||||||
|
@@ -76,8 +76,8 @@ namespace Ryujinx.Headless.SDL2
|
|||||||
[Option("enable-mouse", Required = false, Default = false, HelpText = "Enable or disable mouse support.")]
|
[Option("enable-mouse", Required = false, Default = false, HelpText = "Enable or disable mouse support.")]
|
||||||
public bool EnableMouse { get; set; }
|
public bool EnableMouse { get; set; }
|
||||||
|
|
||||||
[Option("hide-cursor", Required = false, Default = HideCursor.OnIdle, HelpText = "Change when the cursor gets hidden.")]
|
[Option("hide-cursor", Required = false, Default = HideCursorMode.OnIdle, HelpText = "Change when the cursor gets hidden.")]
|
||||||
public HideCursor HideCursor { get; set; }
|
public HideCursorMode HideCursorMode { get; set; }
|
||||||
|
|
||||||
[Option("list-input-profiles", Required = false, HelpText = "List inputs profiles.")]
|
[Option("list-input-profiles", Required = false, HelpText = "List inputs profiles.")]
|
||||||
public bool ListInputProfiles { get; set; }
|
public bool ListInputProfiles { get; set; }
|
||||||
|
@@ -478,8 +478,8 @@ namespace Ryujinx.Headless.SDL2
|
|||||||
private static WindowBase CreateWindow(Options options)
|
private static WindowBase CreateWindow(Options options)
|
||||||
{
|
{
|
||||||
return options.GraphicsBackend == GraphicsBackend.Vulkan
|
return options.GraphicsBackend == GraphicsBackend.Vulkan
|
||||||
? new VulkanWindow(_inputManager, options.LoggingGraphicsDebugLevel, options.AspectRatio, options.EnableMouse, options.HideCursor)
|
? new VulkanWindow(_inputManager, options.LoggingGraphicsDebugLevel, options.AspectRatio, options.EnableMouse, options.HideCursorMode)
|
||||||
: new OpenGLWindow(_inputManager, options.LoggingGraphicsDebugLevel, options.AspectRatio, options.EnableMouse, options.HideCursor);
|
: new OpenGLWindow(_inputManager, options.LoggingGraphicsDebugLevel, options.AspectRatio, options.EnableMouse, options.HideCursorMode);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static IRenderer CreateRenderer(Options options, WindowBase window)
|
private static IRenderer CreateRenderer(Options options, WindowBase window)
|
||||||
|
@@ -1,4 +1,5 @@
|
|||||||
using Ryujinx.Input;
|
using Ryujinx.Common.Configuration;
|
||||||
|
using Ryujinx.Input;
|
||||||
using System;
|
using System;
|
||||||
using System.Diagnostics;
|
using System.Diagnostics;
|
||||||
using System.Drawing;
|
using System.Drawing;
|
||||||
@@ -13,7 +14,7 @@ namespace Ryujinx.Headless.SDL2
|
|||||||
private const int CursorHideIdleTime = 5; // seconds
|
private const int CursorHideIdleTime = 5; // seconds
|
||||||
|
|
||||||
private bool _isDisposed;
|
private bool _isDisposed;
|
||||||
private HideCursor _hideCursor;
|
private HideCursorMode _hideCursorMode;
|
||||||
private bool _isHidden;
|
private bool _isHidden;
|
||||||
private long _lastCursorMoveTime;
|
private long _lastCursorMoveTime;
|
||||||
|
|
||||||
@@ -23,12 +24,12 @@ namespace Ryujinx.Headless.SDL2
|
|||||||
public Vector2 Scroll { get; private set; }
|
public Vector2 Scroll { get; private set; }
|
||||||
public Size _clientSize;
|
public Size _clientSize;
|
||||||
|
|
||||||
public SDL2MouseDriver(HideCursor hideCursor)
|
public SDL2MouseDriver(HideCursorMode hideCursorMode)
|
||||||
{
|
{
|
||||||
PressedButtons = new bool[(int)MouseButton.Count];
|
PressedButtons = new bool[(int)MouseButton.Count];
|
||||||
_hideCursor = hideCursor;
|
_hideCursorMode = hideCursorMode;
|
||||||
|
|
||||||
if (_hideCursor == HideCursor.Always)
|
if (_hideCursorMode == HideCursorMode.Always)
|
||||||
{
|
{
|
||||||
SDL_ShowCursor(SDL_DISABLE);
|
SDL_ShowCursor(SDL_DISABLE);
|
||||||
_isHidden = true;
|
_isHidden = true;
|
||||||
@@ -59,7 +60,7 @@ namespace Ryujinx.Headless.SDL2
|
|||||||
|
|
||||||
private void CheckIdle()
|
private void CheckIdle()
|
||||||
{
|
{
|
||||||
if (_hideCursor != HideCursor.OnIdle)
|
if (_hideCursorMode != HideCursorMode.OnIdle)
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@@ -17,8 +17,8 @@ namespace Ryujinx.Headless.SDL2.Vulkan
|
|||||||
GraphicsDebugLevel glLogLevel,
|
GraphicsDebugLevel glLogLevel,
|
||||||
AspectRatio aspectRatio,
|
AspectRatio aspectRatio,
|
||||||
bool enableMouse,
|
bool enableMouse,
|
||||||
HideCursor hideCursor)
|
HideCursorMode hideCursorMode)
|
||||||
: base(inputManager, glLogLevel, aspectRatio, enableMouse, hideCursor)
|
: base(inputManager, glLogLevel, aspectRatio, enableMouse, hideCursorMode)
|
||||||
{
|
{
|
||||||
_glLogLevel = glLogLevel;
|
_glLogLevel = glLogLevel;
|
||||||
}
|
}
|
||||||
|
@@ -78,9 +78,9 @@ namespace Ryujinx.Headless.SDL2
|
|||||||
GraphicsDebugLevel glLogLevel,
|
GraphicsDebugLevel glLogLevel,
|
||||||
AspectRatio aspectRatio,
|
AspectRatio aspectRatio,
|
||||||
bool enableMouse,
|
bool enableMouse,
|
||||||
HideCursor hideCursor)
|
HideCursorMode hideCursorMode)
|
||||||
{
|
{
|
||||||
MouseDriver = new SDL2MouseDriver(hideCursor);
|
MouseDriver = new SDL2MouseDriver(hideCursorMode);
|
||||||
_inputManager = inputManager;
|
_inputManager = inputManager;
|
||||||
_inputManager.SetMouseDriver(MouseDriver);
|
_inputManager.SetMouseDriver(MouseDriver);
|
||||||
NpadManager = _inputManager.CreateNpadManager();
|
NpadManager = _inputManager.CreateNpadManager();
|
||||||
|
@@ -1,6 +1,7 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
|
using System.Reflection.Metadata;
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
|
|
||||||
namespace Ryujinx.Memory.Tracking
|
namespace Ryujinx.Memory.Tracking
|
||||||
@@ -443,6 +444,16 @@ namespace Ryujinx.Memory.Tracking
|
|||||||
return Address < address + size && address < EndAddress;
|
return Address < address + size && address < EndAddress;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Determines if this handle's memory range matches another exactly.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="other">The other handle</param>
|
||||||
|
/// <returns>True on a match, false otherwise</returns>
|
||||||
|
public bool RangeEquals(RegionHandle other)
|
||||||
|
{
|
||||||
|
return RealAddress == other.RealAddress && RealSize == other.RealSize;
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Dispose the handle. Within the tracking lock, this removes references from virtual regions.
|
/// Dispose the handle. Within the tracking lock, this removes references from virtual regions.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
@@ -1,5 +1,16 @@
|
|||||||
using LibHac.Common;
|
using LibHac.Common;
|
||||||
using LibHac.Ns;
|
using LibHac.Ns;
|
||||||
|
using LibHac.Fs;
|
||||||
|
using LibHac.Fs.Fsa;
|
||||||
|
using LibHac.FsSystem;
|
||||||
|
using LibHac.Loader;
|
||||||
|
using LibHac.Tools.Fs;
|
||||||
|
using LibHac.Tools.FsSystem;
|
||||||
|
using LibHac.Tools.FsSystem.NcaUtils;
|
||||||
|
using Ryujinx.Common.Logging;
|
||||||
|
using Ryujinx.HLE.FileSystem;
|
||||||
|
using System;
|
||||||
|
using System.IO;
|
||||||
|
|
||||||
namespace Ryujinx.Ui.App.Common
|
namespace Ryujinx.Ui.App.Common
|
||||||
{
|
{
|
||||||
@@ -19,5 +30,122 @@ namespace Ryujinx.Ui.App.Common
|
|||||||
public double FileSizeBytes { get; set; }
|
public double FileSizeBytes { get; set; }
|
||||||
public string Path { get; set; }
|
public string Path { get; set; }
|
||||||
public BlitStruct<ApplicationControlProperty> ControlHolder { get; set; }
|
public BlitStruct<ApplicationControlProperty> ControlHolder { get; set; }
|
||||||
|
|
||||||
|
public static string GetApplicationBuildId(VirtualFileSystem virtualFileSystem, string titleFilePath)
|
||||||
|
{
|
||||||
|
using FileStream file = new(titleFilePath, FileMode.Open, FileAccess.Read);
|
||||||
|
|
||||||
|
Nca mainNca = null;
|
||||||
|
Nca patchNca = null;
|
||||||
|
|
||||||
|
if (!System.IO.Path.Exists(titleFilePath))
|
||||||
|
{
|
||||||
|
Logger.Error?.Print(LogClass.Application, $"File does not exists. {titleFilePath}");
|
||||||
|
return string.Empty;
|
||||||
|
}
|
||||||
|
|
||||||
|
string extension = System.IO.Path.GetExtension(titleFilePath).ToLower();
|
||||||
|
|
||||||
|
if (extension is ".nsp" or ".xci")
|
||||||
|
{
|
||||||
|
PartitionFileSystem pfs;
|
||||||
|
|
||||||
|
if (extension == ".xci")
|
||||||
|
{
|
||||||
|
Xci xci = new(virtualFileSystem.KeySet, file.AsStorage());
|
||||||
|
|
||||||
|
pfs = xci.OpenPartition(XciPartitionType.Secure);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
pfs = new PartitionFileSystem(file.AsStorage());
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach (DirectoryEntryEx fileEntry in pfs.EnumerateEntries("/", "*.nca"))
|
||||||
|
{
|
||||||
|
using var ncaFile = new UniqueRef<IFile>();
|
||||||
|
|
||||||
|
pfs.OpenFile(ref ncaFile.Ref, fileEntry.FullPath.ToU8Span(), OpenMode.Read).ThrowIfFailure();
|
||||||
|
|
||||||
|
Nca nca = new(virtualFileSystem.KeySet, ncaFile.Get.AsStorage());
|
||||||
|
|
||||||
|
if (nca.Header.ContentType != NcaContentType.Program)
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
int dataIndex = Nca.GetSectionIndexFromType(NcaSectionType.Data, NcaContentType.Program);
|
||||||
|
|
||||||
|
if (nca.Header.GetFsHeader(dataIndex).IsPatchSection())
|
||||||
|
{
|
||||||
|
patchNca = nca;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
mainNca = nca;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if (extension == ".nca")
|
||||||
|
{
|
||||||
|
mainNca = new Nca(virtualFileSystem.KeySet, file.AsStorage());
|
||||||
|
}
|
||||||
|
|
||||||
|
if (mainNca == null)
|
||||||
|
{
|
||||||
|
Logger.Error?.Print(LogClass.Application, "Extraction failure. The main NCA was not present in the selected file");
|
||||||
|
|
||||||
|
return string.Empty;
|
||||||
|
}
|
||||||
|
|
||||||
|
(Nca updatePatchNca, _) = ApplicationLibrary.GetGameUpdateData(virtualFileSystem, mainNca.Header.TitleId.ToString("x16"), 0, out _);
|
||||||
|
|
||||||
|
if (updatePatchNca != null)
|
||||||
|
{
|
||||||
|
patchNca = updatePatchNca;
|
||||||
|
}
|
||||||
|
|
||||||
|
IFileSystem codeFs = null;
|
||||||
|
|
||||||
|
if (patchNca == null)
|
||||||
|
{
|
||||||
|
if (mainNca.CanOpenSection(NcaSectionType.Code))
|
||||||
|
{
|
||||||
|
codeFs = mainNca.OpenFileSystem(NcaSectionType.Code, IntegrityCheckLevel.ErrorOnInvalid);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
if (patchNca.CanOpenSection(NcaSectionType.Code))
|
||||||
|
{
|
||||||
|
codeFs = mainNca.OpenFileSystemWithPatch(patchNca, NcaSectionType.Code, IntegrityCheckLevel.ErrorOnInvalid);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (codeFs == null)
|
||||||
|
{
|
||||||
|
Logger.Error?.Print(LogClass.Loader, "No ExeFS found in NCA");
|
||||||
|
|
||||||
|
return string.Empty;
|
||||||
|
}
|
||||||
|
|
||||||
|
const string mainExeFs = "main";
|
||||||
|
|
||||||
|
if (!codeFs.FileExists($"/{mainExeFs}"))
|
||||||
|
{
|
||||||
|
Logger.Error?.Print(LogClass.Loader, "No main binary ExeFS found in ExeFS");
|
||||||
|
|
||||||
|
return string.Empty;
|
||||||
|
}
|
||||||
|
|
||||||
|
using var nsoFile = new UniqueRef<IFile>();
|
||||||
|
|
||||||
|
codeFs.OpenFile(ref nsoFile.Ref, $"/{mainExeFs}".ToU8Span(), OpenMode.Read).ThrowIfFailure();
|
||||||
|
|
||||||
|
NsoReader reader = new NsoReader();
|
||||||
|
reader.Initialize(nsoFile.Release().AsStorage().AsFile(OpenMode.Read)).ThrowIfFailure();
|
||||||
|
|
||||||
|
return BitConverter.ToString(reader.Header.ModuleId.ItemsRo.ToArray()).Replace("-", "").ToUpper()[..16];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
@@ -162,9 +162,9 @@ namespace Ryujinx.Ui.Common.Configuration
|
|||||||
public bool ShowConfirmExit { get; set; }
|
public bool ShowConfirmExit { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Hide Cursor on Idle
|
/// Whether to hide cursor on idle, always or never
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public bool HideCursorOnIdle { get; set; }
|
public HideCursorMode HideCursor { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Enables or disables Vertical Sync
|
/// Enables or disables Vertical Sync
|
||||||
|
@@ -613,7 +613,7 @@ namespace Ryujinx.Ui.Common.Configuration
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// Hide Cursor on Idle
|
/// Hide Cursor on Idle
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public ReactiveObject<bool> HideCursorOnIdle { get; private set; }
|
public ReactiveObject<HideCursorMode> HideCursor { get; private set; }
|
||||||
|
|
||||||
private ConfigurationState()
|
private ConfigurationState()
|
||||||
{
|
{
|
||||||
@@ -626,7 +626,7 @@ namespace Ryujinx.Ui.Common.Configuration
|
|||||||
EnableDiscordIntegration = new ReactiveObject<bool>();
|
EnableDiscordIntegration = new ReactiveObject<bool>();
|
||||||
CheckUpdatesOnStart = new ReactiveObject<bool>();
|
CheckUpdatesOnStart = new ReactiveObject<bool>();
|
||||||
ShowConfirmExit = new ReactiveObject<bool>();
|
ShowConfirmExit = new ReactiveObject<bool>();
|
||||||
HideCursorOnIdle = new ReactiveObject<bool>();
|
HideCursor = new ReactiveObject<HideCursorMode>();
|
||||||
}
|
}
|
||||||
|
|
||||||
public ConfigurationFileFormat ToFileFormat()
|
public ConfigurationFileFormat ToFileFormat()
|
||||||
@@ -662,7 +662,7 @@ namespace Ryujinx.Ui.Common.Configuration
|
|||||||
EnableDiscordIntegration = EnableDiscordIntegration,
|
EnableDiscordIntegration = EnableDiscordIntegration,
|
||||||
CheckUpdatesOnStart = CheckUpdatesOnStart,
|
CheckUpdatesOnStart = CheckUpdatesOnStart,
|
||||||
ShowConfirmExit = ShowConfirmExit,
|
ShowConfirmExit = ShowConfirmExit,
|
||||||
HideCursorOnIdle = HideCursorOnIdle,
|
HideCursor = HideCursor,
|
||||||
EnableVsync = Graphics.EnableVsync,
|
EnableVsync = Graphics.EnableVsync,
|
||||||
EnableShaderCache = Graphics.EnableShaderCache,
|
EnableShaderCache = Graphics.EnableShaderCache,
|
||||||
EnableTextureRecompression = Graphics.EnableTextureRecompression,
|
EnableTextureRecompression = Graphics.EnableTextureRecompression,
|
||||||
@@ -767,7 +767,7 @@ namespace Ryujinx.Ui.Common.Configuration
|
|||||||
EnableDiscordIntegration.Value = true;
|
EnableDiscordIntegration.Value = true;
|
||||||
CheckUpdatesOnStart.Value = true;
|
CheckUpdatesOnStart.Value = true;
|
||||||
ShowConfirmExit.Value = true;
|
ShowConfirmExit.Value = true;
|
||||||
HideCursorOnIdle.Value = false;
|
HideCursor.Value = Ryujinx.Common.Configuration.HideCursorMode.Never;
|
||||||
Graphics.EnableVsync.Value = true;
|
Graphics.EnableVsync.Value = true;
|
||||||
Graphics.EnableShaderCache.Value = true;
|
Graphics.EnableShaderCache.Value = true;
|
||||||
Graphics.EnableTextureRecompression.Value = false;
|
Graphics.EnableTextureRecompression.Value = false;
|
||||||
@@ -1046,7 +1046,7 @@ namespace Ryujinx.Ui.Common.Configuration
|
|||||||
{
|
{
|
||||||
Ryujinx.Common.Logging.Logger.Warning?.Print(LogClass.Application, $"Outdated configuration version {configurationFileFormat.Version}, migrating to version 22.");
|
Ryujinx.Common.Logging.Logger.Warning?.Print(LogClass.Application, $"Outdated configuration version {configurationFileFormat.Version}, migrating to version 22.");
|
||||||
|
|
||||||
configurationFileFormat.HideCursorOnIdle = false;
|
configurationFileFormat.HideCursor = HideCursorMode.Never;
|
||||||
|
|
||||||
configurationFileUpdated = true;
|
configurationFileUpdated = true;
|
||||||
}
|
}
|
||||||
@@ -1427,7 +1427,7 @@ namespace Ryujinx.Ui.Common.Configuration
|
|||||||
EnableDiscordIntegration.Value = configurationFileFormat.EnableDiscordIntegration;
|
EnableDiscordIntegration.Value = configurationFileFormat.EnableDiscordIntegration;
|
||||||
CheckUpdatesOnStart.Value = configurationFileFormat.CheckUpdatesOnStart;
|
CheckUpdatesOnStart.Value = configurationFileFormat.CheckUpdatesOnStart;
|
||||||
ShowConfirmExit.Value = configurationFileFormat.ShowConfirmExit;
|
ShowConfirmExit.Value = configurationFileFormat.ShowConfirmExit;
|
||||||
HideCursorOnIdle.Value = configurationFileFormat.HideCursorOnIdle;
|
HideCursor.Value = configurationFileFormat.HideCursor;
|
||||||
Graphics.EnableVsync.Value = configurationFileFormat.EnableVsync;
|
Graphics.EnableVsync.Value = configurationFileFormat.EnableVsync;
|
||||||
Graphics.EnableShaderCache.Value = configurationFileFormat.EnableShaderCache;
|
Graphics.EnableShaderCache.Value = configurationFileFormat.EnableShaderCache;
|
||||||
Graphics.EnableTextureRecompression.Value = configurationFileFormat.EnableTextureRecompression;
|
Graphics.EnableTextureRecompression.Value = configurationFileFormat.EnableTextureRecompression;
|
||||||
|
@@ -9,6 +9,7 @@ namespace Ryujinx.Ui.Common.Helper
|
|||||||
|
|
||||||
public static bool? OverrideDockedMode { get; private set; }
|
public static bool? OverrideDockedMode { get; private set; }
|
||||||
public static string OverrideGraphicsBackend { get; private set; }
|
public static string OverrideGraphicsBackend { get; private set; }
|
||||||
|
public static string OverrideHideCursor { get; private set; }
|
||||||
public static string BaseDirPathArg { get; private set; }
|
public static string BaseDirPathArg { get; private set; }
|
||||||
public static string Profile { get; private set; }
|
public static string Profile { get; private set; }
|
||||||
public static string LaunchPathArg { get; private set; }
|
public static string LaunchPathArg { get; private set; }
|
||||||
@@ -76,6 +77,16 @@ namespace Ryujinx.Ui.Common.Helper
|
|||||||
case "--handheld-mode":
|
case "--handheld-mode":
|
||||||
OverrideDockedMode = false;
|
OverrideDockedMode = false;
|
||||||
break;
|
break;
|
||||||
|
case "--hide-cursor":
|
||||||
|
if (i + 1 >= args.Length)
|
||||||
|
{
|
||||||
|
Logger.Error?.Print(LogClass.Application, $"Invalid option '{arg}'");
|
||||||
|
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
OverrideHideCursor = args[++i];
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
LaunchPathArg = arg;
|
LaunchPathArg = arg;
|
||||||
break;
|
break;
|
||||||
|
@@ -209,7 +209,7 @@ namespace Ryujinx
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Check if graphics backend was overridden
|
// Check if graphics backend was overridden.
|
||||||
if (CommandLineState.OverrideGraphicsBackend != null)
|
if (CommandLineState.OverrideGraphicsBackend != null)
|
||||||
{
|
{
|
||||||
if (CommandLineState.OverrideGraphicsBackend.ToLower() == "opengl")
|
if (CommandLineState.OverrideGraphicsBackend.ToLower() == "opengl")
|
||||||
@@ -224,7 +224,19 @@ namespace Ryujinx
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Check if docked mode was overriden.
|
// Check if HideCursor was overridden.
|
||||||
|
if (CommandLineState.OverrideHideCursor is not null)
|
||||||
|
{
|
||||||
|
ConfigurationState.Instance.HideCursor.Value = CommandLineState.OverrideHideCursor!.ToLower() switch
|
||||||
|
{
|
||||||
|
"never" => HideCursorMode.Never,
|
||||||
|
"onidle" => HideCursorMode.OnIdle,
|
||||||
|
"always" => HideCursorMode.Always,
|
||||||
|
_ => ConfigurationState.Instance.HideCursor.Value
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check if docked mode was overridden.
|
||||||
if (CommandLineState.OverrideDockedMode.HasValue)
|
if (CommandLineState.OverrideDockedMode.HasValue)
|
||||||
{
|
{
|
||||||
ConfigurationState.Instance.System.EnableDockedMode.Value = CommandLineState.OverrideDockedMode.Value;
|
ConfigurationState.Instance.System.EnableDockedMode.Value = CommandLineState.OverrideDockedMode.Value;
|
||||||
|
@@ -1626,9 +1626,12 @@ namespace Ryujinx.Ui
|
|||||||
|
|
||||||
private void ManageCheats_Pressed(object sender, EventArgs args)
|
private void ManageCheats_Pressed(object sender, EventArgs args)
|
||||||
{
|
{
|
||||||
var window = new CheatWindow(_virtualFileSystem,
|
var window = new CheatWindow(
|
||||||
|
_virtualFileSystem,
|
||||||
_emulationContext.Processes.ActiveApplication.ProgramId,
|
_emulationContext.Processes.ActiveApplication.ProgramId,
|
||||||
_emulationContext.Processes.ActiveApplication.ApplicationControlProperties.Title[(int)_emulationContext.System.State.DesiredTitleLanguage].NameString.ToString());
|
_emulationContext.Processes.ActiveApplication.ApplicationControlProperties
|
||||||
|
.Title[(int)_emulationContext.System.State.DesiredTitleLanguage].NameString.ToString(),
|
||||||
|
_currentEmulatedGamePath);
|
||||||
|
|
||||||
window.Destroyed += CheatWindow_Destroyed;
|
window.Destroyed += CheatWindow_Destroyed;
|
||||||
window.Show();
|
window.Show();
|
||||||
|
@@ -72,7 +72,7 @@ namespace Ryujinx.Ui
|
|||||||
const int CursorHideIdleTime = 5; // seconds
|
const int CursorHideIdleTime = 5; // seconds
|
||||||
private static readonly Cursor _invisibleCursor = new Cursor(Display.Default, CursorType.BlankCursor);
|
private static readonly Cursor _invisibleCursor = new Cursor(Display.Default, CursorType.BlankCursor);
|
||||||
private long _lastCursorMoveTime;
|
private long _lastCursorMoveTime;
|
||||||
private bool _hideCursorOnIdle;
|
private HideCursorMode _hideCursorMode;
|
||||||
private InputManager _inputManager;
|
private InputManager _inputManager;
|
||||||
private IKeyboard _keyboardInterface;
|
private IKeyboard _keyboardInterface;
|
||||||
private GraphicsDebugLevel _glLogLevel;
|
private GraphicsDebugLevel _glLogLevel;
|
||||||
@@ -113,10 +113,10 @@ namespace Ryujinx.Ui
|
|||||||
|
|
||||||
_gpuCancellationTokenSource = new CancellationTokenSource();
|
_gpuCancellationTokenSource = new CancellationTokenSource();
|
||||||
|
|
||||||
_hideCursorOnIdle = ConfigurationState.Instance.HideCursorOnIdle;
|
_hideCursorMode = ConfigurationState.Instance.HideCursor;
|
||||||
_lastCursorMoveTime = Stopwatch.GetTimestamp();
|
_lastCursorMoveTime = Stopwatch.GetTimestamp();
|
||||||
|
|
||||||
ConfigurationState.Instance.HideCursorOnIdle.Event += HideCursorStateChanged;
|
ConfigurationState.Instance.HideCursor.Event += HideCursorStateChanged;
|
||||||
ConfigurationState.Instance.Graphics.AntiAliasing.Event += UpdateAnriAliasing;
|
ConfigurationState.Instance.Graphics.AntiAliasing.Event += UpdateAnriAliasing;
|
||||||
ConfigurationState.Instance.Graphics.ScalingFilter.Event += UpdateScalingFilter;
|
ConfigurationState.Instance.Graphics.ScalingFilter.Event += UpdateScalingFilter;
|
||||||
ConfigurationState.Instance.Graphics.ScalingFilterLevel.Event += UpdateScalingFilterLevel;
|
ConfigurationState.Instance.Graphics.ScalingFilterLevel.Event += UpdateScalingFilterLevel;
|
||||||
@@ -145,26 +145,32 @@ namespace Ryujinx.Ui
|
|||||||
return Renderer.GetHardwareInfo().GpuVendor;
|
return Renderer.GetHardwareInfo().GpuVendor;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void HideCursorStateChanged(object sender, ReactiveEventArgs<bool> state)
|
private void HideCursorStateChanged(object sender, ReactiveEventArgs<HideCursorMode> state)
|
||||||
{
|
{
|
||||||
Application.Invoke(delegate
|
Application.Invoke(delegate
|
||||||
{
|
{
|
||||||
_hideCursorOnIdle = state.NewValue;
|
_hideCursorMode = state.NewValue;
|
||||||
|
|
||||||
if (_hideCursorOnIdle)
|
switch (_hideCursorMode)
|
||||||
{
|
|
||||||
_lastCursorMoveTime = Stopwatch.GetTimestamp();
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
{
|
||||||
|
case HideCursorMode.Never:
|
||||||
Window.Cursor = null;
|
Window.Cursor = null;
|
||||||
|
break;
|
||||||
|
case HideCursorMode.OnIdle:
|
||||||
|
_lastCursorMoveTime = Stopwatch.GetTimestamp();
|
||||||
|
break;
|
||||||
|
case HideCursorMode.Always:
|
||||||
|
Window.Cursor = _invisibleCursor;
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
throw new ArgumentOutOfRangeException();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
private void Renderer_Destroyed(object sender, EventArgs e)
|
private void Renderer_Destroyed(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
ConfigurationState.Instance.HideCursorOnIdle.Event -= HideCursorStateChanged;
|
ConfigurationState.Instance.HideCursor.Event -= HideCursorStateChanged;
|
||||||
ConfigurationState.Instance.Graphics.AntiAliasing.Event -= UpdateAnriAliasing;
|
ConfigurationState.Instance.Graphics.AntiAliasing.Event -= UpdateAnriAliasing;
|
||||||
ConfigurationState.Instance.Graphics.ScalingFilter.Event -= UpdateScalingFilter;
|
ConfigurationState.Instance.Graphics.ScalingFilter.Event -= UpdateScalingFilter;
|
||||||
ConfigurationState.Instance.Graphics.ScalingFilterLevel.Event -= UpdateScalingFilterLevel;
|
ConfigurationState.Instance.Graphics.ScalingFilterLevel.Event -= UpdateScalingFilterLevel;
|
||||||
@@ -180,7 +186,7 @@ namespace Ryujinx.Ui
|
|||||||
|
|
||||||
protected override bool OnMotionNotifyEvent(EventMotion evnt)
|
protected override bool OnMotionNotifyEvent(EventMotion evnt)
|
||||||
{
|
{
|
||||||
if (_hideCursorOnIdle)
|
if (_hideCursorMode == HideCursorMode.OnIdle)
|
||||||
{
|
{
|
||||||
_lastCursorMoveTime = Stopwatch.GetTimestamp();
|
_lastCursorMoveTime = Stopwatch.GetTimestamp();
|
||||||
}
|
}
|
||||||
@@ -315,17 +321,30 @@ namespace Ryujinx.Ui
|
|||||||
|
|
||||||
_toggleDockedMode = toggleDockedMode;
|
_toggleDockedMode = toggleDockedMode;
|
||||||
|
|
||||||
if (_hideCursorOnIdle && !ConfigurationState.Instance.Hid.EnableMouse)
|
if (ConfigurationState.Instance.Hid.EnableMouse.Value)
|
||||||
{
|
{
|
||||||
long cursorMoveDelta = Stopwatch.GetTimestamp() - _lastCursorMoveTime;
|
if (_isMouseInClient)
|
||||||
Window.Cursor = (cursorMoveDelta >= CursorHideIdleTime * Stopwatch.Frequency) ? _invisibleCursor : null;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (ConfigurationState.Instance.Hid.EnableMouse && _isMouseInClient)
|
|
||||||
{
|
{
|
||||||
Window.Cursor = _invisibleCursor;
|
Window.Cursor = _invisibleCursor;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
switch (_hideCursorMode)
|
||||||
|
{
|
||||||
|
case HideCursorMode.OnIdle:
|
||||||
|
long cursorMoveDelta = Stopwatch.GetTimestamp() - _lastCursorMoveTime;
|
||||||
|
Window.Cursor = (cursorMoveDelta >= CursorHideIdleTime * Stopwatch.Frequency) ? _invisibleCursor : null;
|
||||||
|
break;
|
||||||
|
case HideCursorMode.Always:
|
||||||
|
Window.Cursor = _invisibleCursor;
|
||||||
|
break;
|
||||||
|
case HideCursorMode.Never:
|
||||||
|
Window.Cursor = null;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public void Initialize(Switch device)
|
public void Initialize(Switch device)
|
||||||
{
|
{
|
||||||
|
@@ -270,7 +270,13 @@ namespace Ryujinx.Ui.Widgets
|
|||||||
|
|
||||||
int index = Nca.GetSectionIndexFromType(ncaSectionType, mainNca.Header.ContentType);
|
int index = Nca.GetSectionIndexFromType(ncaSectionType, mainNca.Header.ContentType);
|
||||||
|
|
||||||
IFileSystem ncaFileSystem = patchNca != null ? mainNca.OpenFileSystemWithPatch(patchNca, index, IntegrityCheckLevel.ErrorOnInvalid)
|
bool sectionExistsInPatch = false;
|
||||||
|
if (patchNca != null)
|
||||||
|
{
|
||||||
|
sectionExistsInPatch = patchNca.CanOpenSection(index);
|
||||||
|
}
|
||||||
|
|
||||||
|
IFileSystem ncaFileSystem = sectionExistsInPatch ? mainNca.OpenFileSystemWithPatch(patchNca, index, IntegrityCheckLevel.ErrorOnInvalid)
|
||||||
: mainNca.OpenFileSystem(index, IntegrityCheckLevel.ErrorOnInvalid);
|
: mainNca.OpenFileSystem(index, IntegrityCheckLevel.ErrorOnInvalid);
|
||||||
|
|
||||||
FileSystemClient fsClient = _horizonClient.Fs;
|
FileSystemClient fsClient = _horizonClient.Fs;
|
||||||
@@ -455,21 +461,21 @@ namespace Ryujinx.Ui.Widgets
|
|||||||
|
|
||||||
private void ManageCheats_Clicked(object sender, EventArgs args)
|
private void ManageCheats_Clicked(object sender, EventArgs args)
|
||||||
{
|
{
|
||||||
new CheatWindow(_virtualFileSystem, _titleId, _titleName).Show();
|
new CheatWindow(_virtualFileSystem, _titleId, _titleName, _titleFilePath).Show();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void OpenTitleModDir_Clicked(object sender, EventArgs args)
|
private void OpenTitleModDir_Clicked(object sender, EventArgs args)
|
||||||
{
|
{
|
||||||
string modsBasePath = _virtualFileSystem.ModLoader.GetModsBasePath();
|
string modsBasePath = ModLoader.GetModsBasePath();
|
||||||
string titleModsPath = _virtualFileSystem.ModLoader.GetTitleDir(modsBasePath, _titleIdText);
|
string titleModsPath = ModLoader.GetTitleDir(modsBasePath, _titleIdText);
|
||||||
|
|
||||||
OpenHelper.OpenFolder(titleModsPath);
|
OpenHelper.OpenFolder(titleModsPath);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void OpenTitleSdModDir_Clicked(object sender, EventArgs args)
|
private void OpenTitleSdModDir_Clicked(object sender, EventArgs args)
|
||||||
{
|
{
|
||||||
string sdModsBasePath = _virtualFileSystem.ModLoader.GetSdModsBasePath();
|
string sdModsBasePath = ModLoader.GetSdModsBasePath();
|
||||||
string titleModsPath = _virtualFileSystem.ModLoader.GetTitleDir(sdModsBasePath, _titleIdText);
|
string titleModsPath = ModLoader.GetTitleDir(sdModsBasePath, _titleIdText);
|
||||||
|
|
||||||
OpenHelper.OpenFolder(titleModsPath);
|
OpenHelper.OpenFolder(titleModsPath);
|
||||||
}
|
}
|
||||||
|
@@ -1,6 +1,7 @@
|
|||||||
using Gtk;
|
using Gtk;
|
||||||
using Ryujinx.HLE.FileSystem;
|
using Ryujinx.HLE.FileSystem;
|
||||||
using Ryujinx.HLE.HOS;
|
using Ryujinx.HLE.HOS;
|
||||||
|
using Ryujinx.Ui.App.Common;
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
@@ -17,19 +18,21 @@ namespace Ryujinx.Ui.Windows
|
|||||||
|
|
||||||
#pragma warning disable CS0649, IDE0044
|
#pragma warning disable CS0649, IDE0044
|
||||||
[GUI] Label _baseTitleInfoLabel;
|
[GUI] Label _baseTitleInfoLabel;
|
||||||
|
[GUI] TextView _buildIdTextView;
|
||||||
[GUI] TreeView _cheatTreeView;
|
[GUI] TreeView _cheatTreeView;
|
||||||
[GUI] Button _saveButton;
|
[GUI] Button _saveButton;
|
||||||
#pragma warning restore CS0649, IDE0044
|
#pragma warning restore CS0649, IDE0044
|
||||||
|
|
||||||
public CheatWindow(VirtualFileSystem virtualFileSystem, ulong titleId, string titleName) : this(new Builder("Ryujinx.Ui.Windows.CheatWindow.glade"), virtualFileSystem, titleId, titleName) { }
|
public CheatWindow(VirtualFileSystem virtualFileSystem, ulong titleId, string titleName, string titlePath) : this(new Builder("Ryujinx.Ui.Windows.CheatWindow.glade"), virtualFileSystem, titleId, titleName, titlePath) { }
|
||||||
|
|
||||||
private CheatWindow(Builder builder, VirtualFileSystem virtualFileSystem, ulong titleId, string titleName) : base(builder.GetRawOwnedObject("_cheatWindow"))
|
private CheatWindow(Builder builder, VirtualFileSystem virtualFileSystem, ulong titleId, string titleName, string titlePath) : base(builder.GetRawOwnedObject("_cheatWindow"))
|
||||||
{
|
{
|
||||||
builder.Autoconnect(this);
|
builder.Autoconnect(this);
|
||||||
_baseTitleInfoLabel.Text = $"Cheats Available for {titleName} [{titleId:X16}]";
|
_baseTitleInfoLabel.Text = $"Cheats Available for {titleName} [{titleId:X16}]";
|
||||||
|
_buildIdTextView.Buffer.Text = $"BuildId: {ApplicationData.GetApplicationBuildId(virtualFileSystem, titlePath)}";
|
||||||
|
|
||||||
string modsBasePath = virtualFileSystem.ModLoader.GetModsBasePath();
|
string modsBasePath = ModLoader.GetModsBasePath();
|
||||||
string titleModsPath = virtualFileSystem.ModLoader.GetTitleDir(modsBasePath, titleId.ToString("X16"));
|
string titleModsPath = ModLoader.GetTitleDir(modsBasePath, titleId.ToString("X16"));
|
||||||
|
|
||||||
_enabledCheatsPath = System.IO.Path.Combine(titleModsPath, "cheats", "enabled.txt");
|
_enabledCheatsPath = System.IO.Path.Combine(titleModsPath, "cheats", "enabled.txt");
|
||||||
|
|
||||||
|
@@ -31,6 +31,21 @@
|
|||||||
<property name="position">0</property>
|
<property name="position">0</property>
|
||||||
</packing>
|
</packing>
|
||||||
</child>
|
</child>
|
||||||
|
<child>
|
||||||
|
<object class="GtkTextView" id="_buildIdTextView">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="margin_top">10</property>
|
||||||
|
<property name="halign">center</property>
|
||||||
|
<property name="margin_bottom">10</property>
|
||||||
|
<property name="editable">False</property>
|
||||||
|
<property name="cursor_visible">False</property>
|
||||||
|
</object>
|
||||||
|
<packing>
|
||||||
|
<property name="expand">False</property>
|
||||||
|
<property name="fill">True</property>
|
||||||
|
<property name="position">1</property>
|
||||||
|
</packing>
|
||||||
|
</child>
|
||||||
<child>
|
<child>
|
||||||
<object class="GtkScrolledWindow">
|
<object class="GtkScrolledWindow">
|
||||||
<property name="visible">True</property>
|
<property name="visible">True</property>
|
||||||
@@ -57,7 +72,7 @@
|
|||||||
<packing>
|
<packing>
|
||||||
<property name="expand">True</property>
|
<property name="expand">True</property>
|
||||||
<property name="fill">True</property>
|
<property name="fill">True</property>
|
||||||
<property name="position">1</property>
|
<property name="position">2</property>
|
||||||
</packing>
|
</packing>
|
||||||
</child>
|
</child>
|
||||||
</object>
|
</object>
|
||||||
|
@@ -89,7 +89,7 @@
|
|||||||
<property name="visible">True</property>
|
<property name="visible">True</property>
|
||||||
<property name="can_focus">True</property>
|
<property name="can_focus">True</property>
|
||||||
<property name="receives_default">True</property>
|
<property name="receives_default">True</property>
|
||||||
<property name="tooltip_text" translatable="yes">Adds an update to this list</property>
|
<property name="tooltip_text" translatable="yes">Adds a DLC to this list</property>
|
||||||
<property name="margin_left">10</property>
|
<property name="margin_left">10</property>
|
||||||
<signal name="clicked" handler="AddButton_Clicked" swapped="no"/>
|
<signal name="clicked" handler="AddButton_Clicked" swapped="no"/>
|
||||||
</object>
|
</object>
|
||||||
@@ -105,7 +105,7 @@
|
|||||||
<property name="visible">True</property>
|
<property name="visible">True</property>
|
||||||
<property name="can_focus">True</property>
|
<property name="can_focus">True</property>
|
||||||
<property name="receives_default">True</property>
|
<property name="receives_default">True</property>
|
||||||
<property name="tooltip_text" translatable="yes">Removes the selected update</property>
|
<property name="tooltip_text" translatable="yes">Removes the selected DLC</property>
|
||||||
<property name="margin_left">10</property>
|
<property name="margin_left">10</property>
|
||||||
<signal name="clicked" handler="RemoveButton_Clicked" swapped="no"/>
|
<signal name="clicked" handler="RemoveButton_Clicked" swapped="no"/>
|
||||||
</object>
|
</object>
|
||||||
@@ -121,7 +121,7 @@
|
|||||||
<property name="visible">True</property>
|
<property name="visible">True</property>
|
||||||
<property name="can_focus">True</property>
|
<property name="can_focus">True</property>
|
||||||
<property name="receives_default">True</property>
|
<property name="receives_default">True</property>
|
||||||
<property name="tooltip_text" translatable="yes">Removes the selected update</property>
|
<property name="tooltip_text" translatable="yes">Removes all DLCs</property>
|
||||||
<property name="margin_left">10</property>
|
<property name="margin_left">10</property>
|
||||||
<signal name="clicked" handler="RemoveAllButton_Clicked" swapped="no"/>
|
<signal name="clicked" handler="RemoveAllButton_Clicked" swapped="no"/>
|
||||||
</object>
|
</object>
|
||||||
|
@@ -52,7 +52,9 @@ namespace Ryujinx.Ui.Windows
|
|||||||
[GUI] CheckButton _discordToggle;
|
[GUI] CheckButton _discordToggle;
|
||||||
[GUI] CheckButton _checkUpdatesToggle;
|
[GUI] CheckButton _checkUpdatesToggle;
|
||||||
[GUI] CheckButton _showConfirmExitToggle;
|
[GUI] CheckButton _showConfirmExitToggle;
|
||||||
[GUI] CheckButton _hideCursorOnIdleToggle;
|
[GUI] RadioButton _hideCursorNever;
|
||||||
|
[GUI] RadioButton _hideCursorOnIdle;
|
||||||
|
[GUI] RadioButton _hideCursorAlways;
|
||||||
[GUI] CheckButton _vSyncToggle;
|
[GUI] CheckButton _vSyncToggle;
|
||||||
[GUI] CheckButton _shaderCacheToggle;
|
[GUI] CheckButton _shaderCacheToggle;
|
||||||
[GUI] CheckButton _textureRecompressionToggle;
|
[GUI] CheckButton _textureRecompressionToggle;
|
||||||
@@ -226,9 +228,17 @@ namespace Ryujinx.Ui.Windows
|
|||||||
_showConfirmExitToggle.Click();
|
_showConfirmExitToggle.Click();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ConfigurationState.Instance.HideCursorOnIdle)
|
switch (ConfigurationState.Instance.HideCursor.Value)
|
||||||
{
|
{
|
||||||
_hideCursorOnIdleToggle.Click();
|
case HideCursorMode.Never:
|
||||||
|
_hideCursorNever.Click();
|
||||||
|
break;
|
||||||
|
case HideCursorMode.OnIdle:
|
||||||
|
_hideCursorOnIdle.Click();
|
||||||
|
break;
|
||||||
|
case HideCursorMode.Always:
|
||||||
|
_hideCursorAlways.Click();
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ConfigurationState.Instance.Graphics.EnableVsync)
|
if (ConfigurationState.Instance.Graphics.EnableVsync)
|
||||||
@@ -560,6 +570,18 @@ namespace Ryujinx.Ui.Windows
|
|||||||
_directoryChanged = false;
|
_directoryChanged = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
HideCursorMode hideCursor = HideCursorMode.Never;
|
||||||
|
|
||||||
|
if (_hideCursorOnIdle.Active)
|
||||||
|
{
|
||||||
|
hideCursor = HideCursorMode.OnIdle;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (_hideCursorAlways.Active)
|
||||||
|
{
|
||||||
|
hideCursor = HideCursorMode.Always;
|
||||||
|
}
|
||||||
|
|
||||||
if (!float.TryParse(_resScaleText.Buffer.Text, out float resScaleCustom) || resScaleCustom <= 0.0f)
|
if (!float.TryParse(_resScaleText.Buffer.Text, out float resScaleCustom) || resScaleCustom <= 0.0f)
|
||||||
{
|
{
|
||||||
resScaleCustom = 1.0f;
|
resScaleCustom = 1.0f;
|
||||||
@@ -602,7 +624,7 @@ namespace Ryujinx.Ui.Windows
|
|||||||
ConfigurationState.Instance.EnableDiscordIntegration.Value = _discordToggle.Active;
|
ConfigurationState.Instance.EnableDiscordIntegration.Value = _discordToggle.Active;
|
||||||
ConfigurationState.Instance.CheckUpdatesOnStart.Value = _checkUpdatesToggle.Active;
|
ConfigurationState.Instance.CheckUpdatesOnStart.Value = _checkUpdatesToggle.Active;
|
||||||
ConfigurationState.Instance.ShowConfirmExit.Value = _showConfirmExitToggle.Active;
|
ConfigurationState.Instance.ShowConfirmExit.Value = _showConfirmExitToggle.Active;
|
||||||
ConfigurationState.Instance.HideCursorOnIdle.Value = _hideCursorOnIdleToggle.Active;
|
ConfigurationState.Instance.HideCursor.Value = hideCursor;
|
||||||
ConfigurationState.Instance.Graphics.EnableVsync.Value = _vSyncToggle.Active;
|
ConfigurationState.Instance.Graphics.EnableVsync.Value = _vSyncToggle.Active;
|
||||||
ConfigurationState.Instance.Graphics.EnableShaderCache.Value = _shaderCacheToggle.Active;
|
ConfigurationState.Instance.Graphics.EnableShaderCache.Value = _shaderCacheToggle.Active;
|
||||||
ConfigurationState.Instance.Graphics.EnableTextureRecompression.Value = _textureRecompressionToggle.Active;
|
ConfigurationState.Instance.Graphics.EnableTextureRecompression.Value = _textureRecompressionToggle.Active;
|
||||||
@@ -698,6 +720,7 @@ namespace Ryujinx.Ui.Windows
|
|||||||
if (Directory.Exists(_addGameDirBox.Buffer.Text))
|
if (Directory.Exists(_addGameDirBox.Buffer.Text))
|
||||||
{
|
{
|
||||||
_gameDirsBoxStore.AppendValues(_addGameDirBox.Buffer.Text);
|
_gameDirsBoxStore.AppendValues(_addGameDirBox.Buffer.Text);
|
||||||
|
_directoryChanged = true;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@@ -160,21 +160,85 @@
|
|||||||
</packing>
|
</packing>
|
||||||
</child>
|
</child>
|
||||||
<child>
|
<child>
|
||||||
<object class="GtkCheckButton" id="_hideCursorOnIdleToggle">
|
<object class="GtkBox" id="_hideCursorBox">
|
||||||
<property name="label" translatable="yes">Hide Cursor On Idle</property>
|
|
||||||
<property name="visible">True</property>
|
<property name="visible">True</property>
|
||||||
<property name="can-focus">True</property>
|
<property name="can-focus">False</property>
|
||||||
<property name="receives-default">False</property>
|
<child>
|
||||||
<property name="halign">start</property>
|
<object class="GtkLabel">
|
||||||
<property name="draw-indicator">True</property>
|
<property name="visible">True</property>
|
||||||
|
<property name="can-focus">False</property>
|
||||||
|
<property name="halign">end</property>
|
||||||
|
<property name="label" translatable="yes">Hide Cursor:</property>
|
||||||
</object>
|
</object>
|
||||||
<packing>
|
<packing>
|
||||||
<property name="expand">False</property>
|
<property name="expand">False</property>
|
||||||
<property name="fill">True</property>
|
<property name="fill">True</property>
|
||||||
<property name="padding">5</property>
|
<property name="padding">5</property>
|
||||||
|
<property name="position">2</property>
|
||||||
|
</packing>
|
||||||
|
</child>
|
||||||
|
<child>
|
||||||
|
<object class="GtkRadioButton" id="_hideCursorNever">
|
||||||
|
<property name="label" translatable="yes">Never</property>
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="can-focus">True</property>
|
||||||
|
<property name="receives-default">False</property>
|
||||||
|
<property name="halign">start</property>
|
||||||
|
<property name="margin-top">5</property>
|
||||||
|
<property name="margin-bottom">5</property>
|
||||||
|
<property name="active">True</property>
|
||||||
|
<property name="draw-indicator">True</property>
|
||||||
|
</object>
|
||||||
|
<packing>
|
||||||
|
<property name="expand">False</property>
|
||||||
|
<property name="fill">True</property>
|
||||||
<property name="position">3</property>
|
<property name="position">3</property>
|
||||||
</packing>
|
</packing>
|
||||||
</child>
|
</child>
|
||||||
|
<child>
|
||||||
|
<object class="GtkRadioButton" id="_hideCursorOnIdle">
|
||||||
|
<property name="label" translatable="yes">On Idle</property>
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="can-focus">True</property>
|
||||||
|
<property name="receives-default">False</property>
|
||||||
|
<property name="halign">start</property>
|
||||||
|
<property name="margin-top">5</property>
|
||||||
|
<property name="margin-bottom">5</property>
|
||||||
|
<property name="draw-indicator">True</property>
|
||||||
|
<property name="group">_hideCursorNever</property>
|
||||||
|
</object>
|
||||||
|
<packing>
|
||||||
|
<property name="expand">False</property>
|
||||||
|
<property name="fill">True</property>
|
||||||
|
<property name="position">4</property>
|
||||||
|
</packing>
|
||||||
|
</child>
|
||||||
|
<child>
|
||||||
|
<object class="GtkRadioButton" id="_hideCursorAlways">
|
||||||
|
<property name="label" translatable="yes">Always</property>
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="can-focus">True</property>
|
||||||
|
<property name="receives-default">False</property>
|
||||||
|
<property name="halign">start</property>
|
||||||
|
<property name="margin-top">5</property>
|
||||||
|
<property name="margin-bottom">5</property>
|
||||||
|
<property name="draw-indicator">True</property>
|
||||||
|
<property name="group">_hideCursorNever</property>
|
||||||
|
</object>
|
||||||
|
<packing>
|
||||||
|
<property name="expand">False</property>
|
||||||
|
<property name="fill">True</property>
|
||||||
|
<property name="position">5</property>
|
||||||
|
</packing>
|
||||||
|
</child>
|
||||||
|
</object>
|
||||||
|
<packing>
|
||||||
|
<property name="expand">False</property>
|
||||||
|
<property name="fill">True</property>
|
||||||
|
<property name="padding">5</property>
|
||||||
|
<property name="position">4</property>
|
||||||
|
</packing>
|
||||||
|
</child>
|
||||||
</object>
|
</object>
|
||||||
<packing>
|
<packing>
|
||||||
<property name="expand">True</property>
|
<property name="expand">True</property>
|
||||||
|
@@ -133,7 +133,7 @@
|
|||||||
<property name="visible">True</property>
|
<property name="visible">True</property>
|
||||||
<property name="can_focus">True</property>
|
<property name="can_focus">True</property>
|
||||||
<property name="receives_default">True</property>
|
<property name="receives_default">True</property>
|
||||||
<property name="tooltip_text" translatable="yes">Removes the selected update</property>
|
<property name="tooltip_text" translatable="yes">Removes all the updates</property>
|
||||||
<property name="margin_left">10</property>
|
<property name="margin_left">10</property>
|
||||||
<signal name="clicked" handler="RemoveAllButton_Clicked" swapped="no"/>
|
<signal name="clicked" handler="RemoveAllButton_Clicked" swapped="no"/>
|
||||||
</object>
|
</object>
|
||||||
|
Reference in New Issue
Block a user