mirror of
https://github.com/Ryujinx/Ryujinx.git
synced 2024-12-17 16:36:47 +00:00
ec3e848d79
* Initial Implementation
About as fast as nvidia GL multithreading, can be improved with faster command queuing.
* Struct based command list
Speeds up a bit. Still a lot of time lost to resource copy.
* Do shader init while the render thread is active.
* Introduce circular span pool V1
Ideally should be able to use structs instead of references for storing these spans on commands. Will try that next.
* Refactor SpanRef some more
Use a struct to represent SpanRef, rather than a reference.
* Flush buffers on background thread
* Use a span for UpdateRenderScale.
Much faster than copying the array.
* Calculate command size using reflection
* WIP parallel shaders
* Some minor optimisation
* Only 2 max refs per command now.
The command with 3 refs is gone. 😌
* Don't cast on the GPU side
* Remove redundant casts, force sync on window present
* Fix Shader Cache
* Fix host shader save.
* Fixup to work with new renderer stuff
* Make command Run static, use array of delegates as lookup
Profile says this takes less time than the previous way.
* Bring up to date
* Add settings toggle. Fix Muiltithreading Off mode.
* Fix warning.
* Release tracking lock for flushes
* Fix Conditional Render fast path with threaded gal
* Make handle iteration safe when releasing the lock
This is mostly temporary.
* Attempt to set backend threading on driver
Only really works on nvidia before launching a game.
* Fix race condition with BufferModifiedRangeList, exceptions in tracking actions
* Update buffer set commands
* Some cleanup
* Only use stutter workaround when using opengl renderer non-threaded
* Add host-conditional reservation of counter events
There has always been the possibility that conditional rendering could use a query object just as it is disposed by the counter queue. This change makes it so that when the host decides to use host conditional rendering, the query object is reserved so that it cannot be deleted. Counter events can optionally start reserved, as the threaded implementation can reserve them before the backend creates them, and there would otherwise be a short amount of time where the counter queue could dispose the event before a call to reserve it could be made.
* Address Feedback
* Make counter flush tracked again.
Hopefully does not cause any issues this time.
* Wait for FlushTo on the main queue thread.
Currently assumes only one thread will want to FlushTo (in this case, the GPU thread)
* Add SDL2 headless integration
* Add HLE macro commands.
Co-authored-by: Mary <mary@mary.zone>
225 lines
8.3 KiB
C#
225 lines
8.3 KiB
C#
using ARMeilleure.Translation.PTC;
|
|
using Gtk;
|
|
using Ryujinx.Common.Configuration;
|
|
using Ryujinx.Common.GraphicsDriver;
|
|
using Ryujinx.Common.Logging;
|
|
using Ryujinx.Common.System;
|
|
using Ryujinx.Common.SystemInfo;
|
|
using Ryujinx.Configuration;
|
|
using Ryujinx.Modules;
|
|
using Ryujinx.Ui;
|
|
using Ryujinx.Ui.Widgets;
|
|
using SixLabors.ImageSharp.Formats.Jpeg;
|
|
using System;
|
|
using System.IO;
|
|
using System.Reflection;
|
|
using System.Runtime.InteropServices;
|
|
using System.Threading.Tasks;
|
|
|
|
namespace Ryujinx
|
|
{
|
|
class Program
|
|
{
|
|
public static double WindowScaleFactor { get; private set; }
|
|
|
|
public static string Version { get; private set; }
|
|
|
|
public static string ConfigurationPath { get; set; }
|
|
|
|
[DllImport("libX11")]
|
|
private extern static int XInitThreads();
|
|
|
|
static void Main(string[] args)
|
|
{
|
|
// Parse Arguments.
|
|
string launchPathArg = null;
|
|
string baseDirPathArg = null;
|
|
bool startFullscreenArg = false;
|
|
|
|
for (int i = 0; i < args.Length; ++i)
|
|
{
|
|
string arg = args[i];
|
|
|
|
if (arg == "-r" || arg == "--root-data-dir")
|
|
{
|
|
if (i + 1 >= args.Length)
|
|
{
|
|
Logger.Error?.Print(LogClass.Application, $"Invalid option '{arg}'");
|
|
|
|
continue;
|
|
}
|
|
|
|
baseDirPathArg = args[++i];
|
|
}
|
|
else if (arg == "-f" || arg == "--fullscreen")
|
|
{
|
|
startFullscreenArg = true;
|
|
}
|
|
else if (launchPathArg == null)
|
|
{
|
|
launchPathArg = arg;
|
|
}
|
|
}
|
|
|
|
// Make process DPI aware for proper window sizing on high-res screens.
|
|
ForceDpiAware.Windows();
|
|
WindowScaleFactor = ForceDpiAware.GetWindowScaleFactor();
|
|
|
|
// Delete backup files after updating.
|
|
Task.Run(Updater.CleanupUpdate);
|
|
|
|
Version = Assembly.GetEntryAssembly().GetCustomAttribute<AssemblyInformationalVersionAttribute>().InformationalVersion;
|
|
|
|
Console.Title = $"Ryujinx Console {Version}";
|
|
|
|
// NOTE: GTK3 doesn't init X11 in a multi threaded way.
|
|
// This ends up causing race condition and abort of XCB when a context is created by SPB (even if SPB do call XInitThreads).
|
|
if (OperatingSystem.IsLinux())
|
|
{
|
|
XInitThreads();
|
|
}
|
|
|
|
string systemPath = Environment.GetEnvironmentVariable("Path", EnvironmentVariableTarget.Machine);
|
|
Environment.SetEnvironmentVariable("Path", $"{Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "bin")};{systemPath}");
|
|
|
|
// Hook unhandled exception and process exit events.
|
|
GLib.ExceptionManager.UnhandledException += (GLib.UnhandledExceptionArgs e) => ProcessUnhandledException(e.ExceptionObject as Exception, e.IsTerminating);
|
|
AppDomain.CurrentDomain.UnhandledException += (object sender, UnhandledExceptionEventArgs e) => ProcessUnhandledException(e.ExceptionObject as Exception, e.IsTerminating);
|
|
AppDomain.CurrentDomain.ProcessExit += (object sender, EventArgs e) => Exit();
|
|
|
|
// Setup base data directory.
|
|
AppDataManager.Initialize(baseDirPathArg);
|
|
|
|
// Initialize the configuration.
|
|
ConfigurationState.Initialize();
|
|
|
|
// Initialize the logger system.
|
|
LoggerModule.Initialize();
|
|
|
|
// Initialize Discord integration.
|
|
DiscordIntegrationModule.Initialize();
|
|
|
|
// Sets ImageSharp Jpeg Encoder Quality.
|
|
SixLabors.ImageSharp.Configuration.Default.ImageFormatsManager.SetEncoder(JpegFormat.Instance, new JpegEncoder()
|
|
{
|
|
Quality = 100
|
|
});
|
|
|
|
string localConfigurationPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Config.json");
|
|
string appDataConfigurationPath = Path.Combine(AppDataManager.BaseDirPath, "Config.json");
|
|
|
|
// Now load the configuration as the other subsystems are now registered
|
|
ConfigurationPath = File.Exists(localConfigurationPath)
|
|
? localConfigurationPath
|
|
: File.Exists(appDataConfigurationPath)
|
|
? appDataConfigurationPath
|
|
: null;
|
|
|
|
if (ConfigurationPath == null)
|
|
{
|
|
// No configuration, we load the default values and save it to disk
|
|
ConfigurationPath = appDataConfigurationPath;
|
|
|
|
ConfigurationState.Instance.LoadDefault();
|
|
ConfigurationState.Instance.ToFileFormat().SaveConfig(ConfigurationPath);
|
|
}
|
|
else
|
|
{
|
|
if (ConfigurationFileFormat.TryLoad(ConfigurationPath, out ConfigurationFileFormat configurationFileFormat))
|
|
{
|
|
ConfigurationState.Instance.Load(configurationFileFormat, ConfigurationPath);
|
|
}
|
|
else
|
|
{
|
|
ConfigurationState.Instance.LoadDefault();
|
|
Logger.Warning?.PrintMsg(LogClass.Application, $"Failed to load config! Loading the default config instead.\nFailed config location {ConfigurationPath}");
|
|
}
|
|
}
|
|
|
|
// Logging system information.
|
|
PrintSystemInfo();
|
|
|
|
// Enable OGL multithreading on the driver, when available.
|
|
BackendThreading threadingMode = ConfigurationState.Instance.Graphics.BackendThreading;
|
|
DriverUtilities.ToggleOGLThreading(threadingMode == BackendThreading.Off);
|
|
|
|
// Initialize Gtk.
|
|
Application.Init();
|
|
|
|
// Check if keys exists.
|
|
bool hasSystemProdKeys = File.Exists(Path.Combine(AppDataManager.KeysDirPath, "prod.keys"));
|
|
bool hasCommonProdKeys = AppDataManager.Mode == AppDataManager.LaunchMode.UserProfile && File.Exists(Path.Combine(AppDataManager.KeysDirPathUser, "prod.keys"));
|
|
if (!hasSystemProdKeys && !hasCommonProdKeys)
|
|
{
|
|
UserErrorDialog.CreateUserErrorDialog(UserError.NoKeys);
|
|
}
|
|
|
|
// Show the main window UI.
|
|
MainWindow mainWindow = new MainWindow();
|
|
mainWindow.Show();
|
|
|
|
if (launchPathArg != null)
|
|
{
|
|
mainWindow.LoadApplication(launchPathArg, startFullscreenArg);
|
|
}
|
|
|
|
if (ConfigurationState.Instance.CheckUpdatesOnStart.Value && Updater.CanUpdate(false))
|
|
{
|
|
Updater.BeginParse(mainWindow, false).ContinueWith(task =>
|
|
{
|
|
Logger.Error?.Print(LogClass.Application, $"Updater Error: {task.Exception}");
|
|
}, TaskContinuationOptions.OnlyOnFaulted);
|
|
}
|
|
|
|
Application.Run();
|
|
}
|
|
|
|
private static void PrintSystemInfo()
|
|
{
|
|
Logger.Notice.Print(LogClass.Application, $"Ryujinx Version: {Version}");
|
|
SystemInfo.Gather().Print();
|
|
|
|
var enabledLogs = Logger.GetEnabledLevels();
|
|
Logger.Notice.Print(LogClass.Application, $"Logs Enabled: {(enabledLogs.Count == 0 ? "<None>" : string.Join(", ", enabledLogs))}");
|
|
|
|
if (AppDataManager.Mode == AppDataManager.LaunchMode.Custom)
|
|
{
|
|
Logger.Notice.Print(LogClass.Application, $"Launch Mode: Custom Path {AppDataManager.BaseDirPath}");
|
|
}
|
|
else
|
|
{
|
|
Logger.Notice.Print(LogClass.Application, $"Launch Mode: {AppDataManager.Mode}");
|
|
}
|
|
}
|
|
|
|
private static void ProcessUnhandledException(Exception ex, bool isTerminating)
|
|
{
|
|
Ptc.Close();
|
|
PtcProfiler.Stop();
|
|
|
|
string message = $"Unhandled exception caught: {ex}";
|
|
|
|
Logger.Error?.PrintMsg(LogClass.Application, message);
|
|
|
|
if (Logger.Error == null)
|
|
{
|
|
Logger.Notice.PrintMsg(LogClass.Application, message);
|
|
}
|
|
|
|
if (isTerminating)
|
|
{
|
|
Exit();
|
|
}
|
|
}
|
|
|
|
public static void Exit()
|
|
{
|
|
DiscordIntegrationModule.Exit();
|
|
|
|
Ptc.Dispose();
|
|
PtcProfiler.Dispose();
|
|
|
|
Logger.Shutdown();
|
|
}
|
|
}
|
|
} |