rebased

emmauss · Jan 13, 2022 · ebeff21 · ebeff21
1 parent b99b121
commit ebeff21
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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/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
@@ -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
@@ -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
@@ -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
 {