From 164aef6776c7e0aacb1d62721ee0b053f279942d Mon Sep 17 00:00:00 2001 From: Emmanuel Hansen Date: Thu, 13 Jan 2022 12:01:20 +0000 Subject: [PATCH] rebased --- Ryujinx.Ava/AppHost.cs | 2 ++ Ryujinx.Ava/Common/ApplicationHelper.cs | 4 +++- Ryujinx.Ava/Common/ApplicationLibrary.cs | 5 ++++- Ryujinx.Ava/Ui/Controls/GameGridView.axaml.cs | 1 + Ryujinx.Ava/Ui/ViewModels/AvatarProfileViewModel.cs | 4 +++- Ryujinx.Ava/Ui/ViewModels/MainWindowViewModel.cs | 5 +++-- Ryujinx.Ava/Ui/ViewModels/SettingsViewModel.cs | 1 + Ryujinx.Ava/Ui/Windows/DlcManagerWindow.axaml.cs | 4 +++- Ryujinx.Ava/Ui/Windows/MainWindow.axaml.cs | 1 + Ryujinx.Ava/Ui/Windows/TitleUpdateWindow.axaml.cs | 3 ++- 10 files changed, 23 insertions(+), 7 deletions(-) diff --git a/Ryujinx.Ava/AppHost.cs b/Ryujinx.Ava/AppHost.cs index c135bad53ce7..88620cd3039f 100644 --- a/Ryujinx.Ava/AppHost.cs +++ b/Ryujinx.Ava/AppHost.cs @@ -3,6 +3,7 @@ using Avalonia.Input; using Avalonia.Threading; using LibHac.FsSystem; +using LibHac.Tools.FsSystem; using OpenTK.Windowing.Common; using Ryujinx.Audio.Backends.Dummy; using Ryujinx.Audio.Backends.OpenAL; @@ -840,6 +841,7 @@ private unsafe void RenderLoop() Device.Gpu.Renderer.RunLoop(() => { + Device.Gpu.SetGpuThread(); Device.Gpu.InitializeShaderCache(); Translator.IsReadyForTranslation.Set(); diff --git a/Ryujinx.Ava/Common/ApplicationHelper.cs b/Ryujinx.Ava/Common/ApplicationHelper.cs index 82113ae7b1d9..9dc2f49760d9 100644 --- a/Ryujinx.Ava/Common/ApplicationHelper.cs +++ b/Ryujinx.Ava/Common/ApplicationHelper.cs @@ -7,7 +7,7 @@ using LibHac.Fs.Fsa; using LibHac.Fs.Shim; using LibHac.FsSystem; -using LibHac.FsSystem.NcaUtils; +using LibHac.Tools.FsSystem.NcaUtils; using LibHac.Ncm; using LibHac.Ns; using Ryujinx.Ava.Common.Locale; @@ -23,6 +23,8 @@ using static LibHac.Fs.ApplicationSaveDataManagement; using ApplicationId = LibHac.Ncm.ApplicationId; using Path = System.IO.Path; +using LibHac.Tools.Fs; +using LibHac.Tools.FsSystem; namespace Ryujinx.Ava.Common { diff --git a/Ryujinx.Ava/Common/ApplicationLibrary.cs b/Ryujinx.Ava/Common/ApplicationLibrary.cs index 06a539e27f37..3acf04ff6038 100644 --- a/Ryujinx.Ava/Common/ApplicationLibrary.cs +++ b/Ryujinx.Ava/Common/ApplicationLibrary.cs @@ -3,7 +3,7 @@ using LibHac.Fs; using LibHac.Fs.Fsa; using LibHac.FsSystem; -using LibHac.FsSystem.NcaUtils; +using LibHac.Tools.FsSystem.NcaUtils; using LibHac.Ns; using Ryujinx.Common.Configuration; using Ryujinx.Common.Logging; @@ -21,6 +21,9 @@ using System.Text.Json; using Path = System.IO.Path; using SpanHelpers = LibHac.Common.SpanHelpers; +using LibHac.Tools.Fs; +using LibHac.Tools.FsSystem; +using LibHac.Common.Keys; namespace Ryujinx.Ava.Common { diff --git a/Ryujinx.Ava/Ui/Controls/GameGridView.axaml.cs b/Ryujinx.Ava/Ui/Controls/GameGridView.axaml.cs index f25839fea734..8db2790e013d 100644 --- a/Ryujinx.Ava/Ui/Controls/GameGridView.axaml.cs +++ b/Ryujinx.Ava/Ui/Controls/GameGridView.axaml.cs @@ -5,6 +5,7 @@ using Avalonia.Interactivity; using Avalonia.Markup.Xaml; using LibHac; +using LibHac.Common; using Ryujinx.Ava.Common; using Ryujinx.Ava.Ui.ViewModels; using System; diff --git a/Ryujinx.Ava/Ui/ViewModels/AvatarProfileViewModel.cs b/Ryujinx.Ava/Ui/ViewModels/AvatarProfileViewModel.cs index 88ec5c0d07f1..dd86a36f218a 100644 --- a/Ryujinx.Ava/Ui/ViewModels/AvatarProfileViewModel.cs +++ b/Ryujinx.Ava/Ui/ViewModels/AvatarProfileViewModel.cs @@ -3,7 +3,9 @@ using LibHac.Fs; using LibHac.Fs.Fsa; using LibHac.FsSystem; -using LibHac.FsSystem.NcaUtils; +using LibHac.Tools.Fs; +using LibHac.Tools.FsSystem; +using LibHac.Tools.FsSystem.NcaUtils; using Ryujinx.Ava.Ui.Models; using Ryujinx.HLE.FileSystem; using Ryujinx.HLE.FileSystem.Content; diff --git a/Ryujinx.Ava/Ui/ViewModels/MainWindowViewModel.cs b/Ryujinx.Ava/Ui/ViewModels/MainWindowViewModel.cs index 57a9409f2abb..1e72f85376d1 100644 --- a/Ryujinx.Ava/Ui/ViewModels/MainWindowViewModel.cs +++ b/Ryujinx.Ava/Ui/ViewModels/MainWindowViewModel.cs @@ -9,7 +9,8 @@ using DynamicData.Binding; using LibHac; using LibHac.Fs; -using LibHac.FsSystem.NcaUtils; +using LibHac.FsSystem; +using LibHac.Tools.FsSystem.NcaUtils; using Ryujinx.Ava.Common; using Ryujinx.Ava.Common.Locale; using Ryujinx.Ava.Ui.Controls; @@ -1553,7 +1554,7 @@ private async void HandleFirmwareInstallation(string path) thread.Start(); } } - catch (LibHac.MissingKeyException ex) + catch (LibHac.Common.Keys.MissingKeyException ex) { Logger.Error?.Print(LogClass.Application, ex.ToString()); UserErrorDialog.ShowUserErrorDialog(UserError.NoKeys, _owner); diff --git a/Ryujinx.Ava/Ui/ViewModels/SettingsViewModel.cs b/Ryujinx.Ava/Ui/ViewModels/SettingsViewModel.cs index 9f56c49e61e7..f336e0f6cb90 100644 --- a/Ryujinx.Ava/Ui/ViewModels/SettingsViewModel.cs +++ b/Ryujinx.Ava/Ui/ViewModels/SettingsViewModel.cs @@ -2,6 +2,7 @@ using Avalonia.Controls; using Avalonia.Threading; using LibHac.FsSystem; +using LibHac.Tools.FsSystem; using Ryujinx.Audio.Backends.OpenAL; using Ryujinx.Audio.Backends.SDL2; using Ryujinx.Audio.Backends.SoundIo; diff --git a/Ryujinx.Ava/Ui/Windows/DlcManagerWindow.axaml.cs b/Ryujinx.Ava/Ui/Windows/DlcManagerWindow.axaml.cs index 6837306bf45e..3ff45c40a9f9 100644 --- a/Ryujinx.Ava/Ui/Windows/DlcManagerWindow.axaml.cs +++ b/Ryujinx.Ava/Ui/Windows/DlcManagerWindow.axaml.cs @@ -6,7 +6,9 @@ using LibHac.Fs; using LibHac.Fs.Fsa; using LibHac.FsSystem; -using LibHac.FsSystem.NcaUtils; +using LibHac.Tools.Fs; +using LibHac.Tools.FsSystem; +using LibHac.Tools.FsSystem.NcaUtils; using Ryujinx.Ava.Common.Locale; using Ryujinx.Ava.Ui.Controls; using Ryujinx.Ava.Ui.Models; diff --git a/Ryujinx.Ava/Ui/Windows/MainWindow.axaml.cs b/Ryujinx.Ava/Ui/Windows/MainWindow.axaml.cs index 89caf1d9cbad..aa1c0c3a3da9 100644 --- a/Ryujinx.Ava/Ui/Windows/MainWindow.axaml.cs +++ b/Ryujinx.Ava/Ui/Windows/MainWindow.axaml.cs @@ -9,6 +9,7 @@ using Avalonia.Threading; using Avalonia.VisualTree; using LibHac; +using LibHac.Common; using Ryujinx.Ava.Common; using Ryujinx.Ava.Common.Locale; using Ryujinx.Ava.Ui.Applet; diff --git a/Ryujinx.Ava/Ui/Windows/TitleUpdateWindow.axaml.cs b/Ryujinx.Ava/Ui/Windows/TitleUpdateWindow.axaml.cs index e20b92cd4e11..c8d41e517a61 100644 --- a/Ryujinx.Ava/Ui/Windows/TitleUpdateWindow.axaml.cs +++ b/Ryujinx.Ava/Ui/Windows/TitleUpdateWindow.axaml.cs @@ -6,7 +6,7 @@ using LibHac.Fs; using LibHac.Fs.Fsa; using LibHac.FsSystem; -using LibHac.FsSystem.NcaUtils; +using LibHac.Tools.FsSystem.NcaUtils; using LibHac.Ns; using Ryujinx.Ava.Common.Locale; using Ryujinx.Ava.Ui.Controls; @@ -23,6 +23,7 @@ using System.Text; using Path = System.IO.Path; using SpanHelpers = LibHac.Common.SpanHelpers; +using LibHac.Tools.FsSystem; namespace Ryujinx.Ava.Ui.Windows {