|
|
@@ -1,10 +1,10 @@
|
|
|
using ARMeilleure.Translation;
|
|
|
using ARMeilleure.Translation.PTC;
|
|
|
using Gdk;
|
|
|
+using Gtk;
|
|
|
using OpenTK.Graphics.OpenGL;
|
|
|
using Ryujinx.Common;
|
|
|
using Ryujinx.Common.Configuration;
|
|
|
-using Ryujinx.Common.Logging;
|
|
|
using Ryujinx.Configuration;
|
|
|
using Ryujinx.Graphics.OpenGL;
|
|
|
using Ryujinx.HLE.HOS.Services.Hid;
|
|
|
@@ -13,9 +13,14 @@ using Ryujinx.Input.HLE;
|
|
|
using Ryujinx.Ui.Widgets;
|
|
|
using SPB.Graphics;
|
|
|
using SPB.Graphics.OpenGL;
|
|
|
+using SPB.Platform;
|
|
|
+using SPB.Platform.GLX;
|
|
|
+using SPB.Platform.WGL;
|
|
|
+using SPB.Windowing;
|
|
|
using System;
|
|
|
using System.Diagnostics;
|
|
|
using System.Linq;
|
|
|
+using System.Runtime.InteropServices;
|
|
|
using System.Threading;
|
|
|
|
|
|
using Key = Ryujinx.Input.Key;
|
|
|
@@ -24,606 +29,123 @@ namespace Ryujinx.Ui
|
|
|
{
|
|
|
using Switch = HLE.Switch;
|
|
|
|
|
|
- public class GlRenderer : GLWidget
|
|
|
+ public class GlRenderer : RendererWidgetBase
|
|
|
{
|
|
|
- private const int SwitchPanelWidth = 1280;
|
|
|
- private const int SwitchPanelHeight = 720;
|
|
|
- private const int TargetFps = 60;
|
|
|
-
|
|
|
- public ManualResetEvent WaitEvent { get; set; }
|
|
|
- public NpadManager NpadManager { get; }
|
|
|
-
|
|
|
- public static event EventHandler<StatusUpdatedEventArgs> StatusUpdatedEvent;
|
|
|
-
|
|
|
- private bool _isActive;
|
|
|
- private bool _isStopped;
|
|
|
- private bool _isFocused;
|
|
|
-
|
|
|
- private double _mouseX;
|
|
|
- private double _mouseY;
|
|
|
- private bool _mousePressed;
|
|
|
-
|
|
|
- private bool _toggleFullscreen;
|
|
|
- private bool _toggleDockedMode;
|
|
|
-
|
|
|
- private readonly long _ticksPerFrame;
|
|
|
-
|
|
|
- private long _ticks = 0;
|
|
|
-
|
|
|
- private readonly Stopwatch _chrono;
|
|
|
-
|
|
|
- private readonly Switch _device;
|
|
|
-
|
|
|
- private Renderer _renderer;
|
|
|
-
|
|
|
- private KeyboardHotkeyState _prevHotkeyState;
|
|
|
-
|
|
|
private GraphicsDebugLevel _glLogLevel;
|
|
|
|
|
|
- private readonly ManualResetEvent _exitEvent;
|
|
|
-
|
|
|
- // Hide Cursor
|
|
|
- const int CursorHideIdleTime = 8; // seconds
|
|
|
- private static readonly Cursor _invisibleCursor = new Cursor(Display.Default, CursorType.BlankCursor);
|
|
|
- private long _lastCursorMoveTime;
|
|
|
- private bool _hideCursorOnIdle;
|
|
|
- private InputManager _inputManager;
|
|
|
- private IKeyboard _keyboardInterface;
|
|
|
+ private bool _initializedOpenGL;
|
|
|
|
|
|
- public GlRenderer(Switch device, InputManager inputManager, GraphicsDebugLevel glLogLevel)
|
|
|
- : base (GetGraphicsMode(),
|
|
|
- 3, 3,
|
|
|
- glLogLevel == GraphicsDebugLevel.None
|
|
|
- ? OpenGLContextFlags.Compat
|
|
|
- : OpenGLContextFlags.Compat | OpenGLContextFlags.Debug)
|
|
|
- {
|
|
|
- _inputManager = inputManager;
|
|
|
- NpadManager = _inputManager.CreateNpadManager();
|
|
|
- _keyboardInterface = (IKeyboard)_inputManager.KeyboardDriver.GetGamepad("0");
|
|
|
-
|
|
|
- NpadManager.ReloadConfiguration(ConfigurationState.Instance.Hid.InputConfig.Value.ToList());
|
|
|
-
|
|
|
- WaitEvent = new ManualResetEvent(false);
|
|
|
-
|
|
|
- _device = device;
|
|
|
-
|
|
|
- Initialized += GLRenderer_Initialized;
|
|
|
- Destroyed += GLRenderer_Destroyed;
|
|
|
- ShuttingDown += GLRenderer_ShuttingDown;
|
|
|
-
|
|
|
- Initialize();
|
|
|
-
|
|
|
- _chrono = new Stopwatch();
|
|
|
-
|
|
|
- _ticksPerFrame = Stopwatch.Frequency / TargetFps;
|
|
|
-
|
|
|
- AddEvents((int)(EventMask.ButtonPressMask
|
|
|
- | EventMask.ButtonReleaseMask
|
|
|
- | EventMask.PointerMotionMask
|
|
|
- | EventMask.KeyPressMask
|
|
|
- | EventMask.KeyReleaseMask));
|
|
|
-
|
|
|
- Shown += Renderer_Shown;
|
|
|
+ private OpenGLContextBase _openGLContext;
|
|
|
+ private SwappableNativeWindowBase _nativeWindow;
|
|
|
|
|
|
+ public GlRenderer(InputManager inputManager, GraphicsDebugLevel glLogLevel) : base(inputManager, glLogLevel)
|
|
|
+ {
|
|
|
_glLogLevel = glLogLevel;
|
|
|
-
|
|
|
- _exitEvent = new ManualResetEvent(false);
|
|
|
-
|
|
|
- _hideCursorOnIdle = ConfigurationState.Instance.HideCursorOnIdle;
|
|
|
- _lastCursorMoveTime = Stopwatch.GetTimestamp();
|
|
|
-
|
|
|
- ConfigurationState.Instance.HideCursorOnIdle.Event += HideCursorStateChanged;
|
|
|
}
|
|
|
|
|
|
- private void HideCursorStateChanged(object sender, ReactiveEventArgs<bool> state)
|
|
|
+ protected override bool OnDrawn(Cairo.Context cr)
|
|
|
{
|
|
|
- Gtk.Application.Invoke(delegate
|
|
|
+ if (!_initializedOpenGL)
|
|
|
{
|
|
|
- _hideCursorOnIdle = state.NewValue;
|
|
|
-
|
|
|
- if (_hideCursorOnIdle)
|
|
|
- {
|
|
|
- _lastCursorMoveTime = Stopwatch.GetTimestamp();
|
|
|
- }
|
|
|
- else
|
|
|
- {
|
|
|
- Window.Cursor = null;
|
|
|
- }
|
|
|
- });
|
|
|
- }
|
|
|
-
|
|
|
- private static FramebufferFormat GetGraphicsMode()
|
|
|
- {
|
|
|
- return Environment.OSVersion.Platform == PlatformID.Unix ? new FramebufferFormat(new ColorFormat(8, 8, 8, 0), 16, 0, ColorFormat.Zero, 0, 2, false) : FramebufferFormat.Default;
|
|
|
- }
|
|
|
-
|
|
|
- private void GLRenderer_ShuttingDown(object sender, EventArgs args)
|
|
|
- {
|
|
|
- _device.DisposeGpu();
|
|
|
- NpadManager.Dispose();
|
|
|
- }
|
|
|
-
|
|
|
- private void Parent_FocusOutEvent(object o, Gtk.FocusOutEventArgs args)
|
|
|
- {
|
|
|
- _isFocused = false;
|
|
|
- }
|
|
|
-
|
|
|
- private void Parent_FocusInEvent(object o, Gtk.FocusInEventArgs args)
|
|
|
- {
|
|
|
- _isFocused = true;
|
|
|
- }
|
|
|
-
|
|
|
- private void GLRenderer_Destroyed(object sender, EventArgs e)
|
|
|
- {
|
|
|
- ConfigurationState.Instance.HideCursorOnIdle.Event -= HideCursorStateChanged;
|
|
|
-
|
|
|
- NpadManager.Dispose();
|
|
|
- Dispose();
|
|
|
- }
|
|
|
+ IntializeOpenGL();
|
|
|
+ }
|
|
|
|
|
|
- protected void Renderer_Shown(object sender, EventArgs e)
|
|
|
- {
|
|
|
- _isFocused = this.ParentWindow.State.HasFlag(Gdk.WindowState.Focused);
|
|
|
+ return true;
|
|
|
}
|
|
|
|
|
|
- public void HandleScreenState(KeyboardStateSnapshot keyboard)
|
|
|
+ private void IntializeOpenGL()
|
|
|
{
|
|
|
- bool toggleFullscreen = keyboard.IsPressed(Key.F11)
|
|
|
- || ((keyboard.IsPressed(Key.AltLeft)
|
|
|
- || keyboard.IsPressed(Key.AltRight))
|
|
|
- && keyboard.IsPressed(Key.Enter))
|
|
|
- || keyboard.IsPressed(Key.Escape);
|
|
|
-
|
|
|
- bool fullScreenToggled = ParentWindow.State.HasFlag(Gdk.WindowState.Fullscreen);
|
|
|
-
|
|
|
- if (toggleFullscreen != _toggleFullscreen)
|
|
|
- {
|
|
|
- if (toggleFullscreen)
|
|
|
- {
|
|
|
- if (fullScreenToggled)
|
|
|
- {
|
|
|
- ParentWindow.Unfullscreen();
|
|
|
- (Toplevel as MainWindow)?.ToggleExtraWidgets(true);
|
|
|
- }
|
|
|
- else
|
|
|
- {
|
|
|
- if (keyboard.IsPressed(Key.Escape))
|
|
|
- {
|
|
|
- if (!ConfigurationState.Instance.ShowConfirmExit || GtkDialog.CreateExitDialog())
|
|
|
- {
|
|
|
- Exit();
|
|
|
- }
|
|
|
- }
|
|
|
- else
|
|
|
- {
|
|
|
- ParentWindow.Fullscreen();
|
|
|
- (Toplevel as MainWindow)?.ToggleExtraWidgets(false);
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
+ _nativeWindow = RetrieveNativeWindow();
|
|
|
|
|
|
- _toggleFullscreen = toggleFullscreen;
|
|
|
+ Window.EnsureNative();
|
|
|
|
|
|
- bool toggleDockedMode = keyboard.IsPressed(Key.F9);
|
|
|
-
|
|
|
- if (toggleDockedMode != _toggleDockedMode)
|
|
|
- {
|
|
|
- if (toggleDockedMode)
|
|
|
- {
|
|
|
- ConfigurationState.Instance.System.EnableDockedMode.Value =
|
|
|
- !ConfigurationState.Instance.System.EnableDockedMode.Value;
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- _toggleDockedMode = toggleDockedMode;
|
|
|
-
|
|
|
- if (_hideCursorOnIdle)
|
|
|
- {
|
|
|
- long cursorMoveDelta = Stopwatch.GetTimestamp() - _lastCursorMoveTime;
|
|
|
- Window.Cursor = (cursorMoveDelta >= CursorHideIdleTime * Stopwatch.Frequency) ? _invisibleCursor : null;
|
|
|
- }
|
|
|
- }
|
|
|
+ _openGLContext = PlatformHelper.CreateOpenGLContext(GetGraphicsMode(), 3, 3, _glLogLevel == GraphicsDebugLevel.None ? OpenGLContextFlags.Compat : OpenGLContextFlags.Compat | OpenGLContextFlags.Debug);
|
|
|
+ _openGLContext.Initialize(_nativeWindow);
|
|
|
+ _openGLContext.MakeCurrent(_nativeWindow);
|
|
|
|
|
|
- private void GLRenderer_Initialized(object sender, EventArgs e)
|
|
|
- {
|
|
|
// Release the GL exclusivity that SPB gave us as we aren't going to use it in GTK Thread.
|
|
|
- OpenGLContext.MakeCurrent(null);
|
|
|
+ _openGLContext.MakeCurrent(null);
|
|
|
|
|
|
WaitEvent.Set();
|
|
|
- }
|
|
|
-
|
|
|
- protected override bool OnConfigureEvent(EventConfigure evnt)
|
|
|
- {
|
|
|
- bool result = base.OnConfigureEvent(evnt);
|
|
|
-
|
|
|
- Gdk.Monitor monitor = Display.GetMonitorAtWindow(Window);
|
|
|
-
|
|
|
- _renderer.Window.SetSize(evnt.Width * monitor.ScaleFactor, evnt.Height * monitor.ScaleFactor);
|
|
|
-
|
|
|
- return result;
|
|
|
- }
|
|
|
-
|
|
|
- public void Start()
|
|
|
- {
|
|
|
- _chrono.Restart();
|
|
|
|
|
|
- _isActive = true;
|
|
|
-
|
|
|
- Gtk.Window parent = this.Toplevel as Gtk.Window;
|
|
|
-
|
|
|
- parent.FocusInEvent += Parent_FocusInEvent;
|
|
|
- parent.FocusOutEvent += Parent_FocusOutEvent;
|
|
|
-
|
|
|
- Gtk.Application.Invoke(delegate
|
|
|
- {
|
|
|
- parent.Present();
|
|
|
-
|
|
|
- string titleNameSection = string.IsNullOrWhiteSpace(_device.Application.TitleName) ? string.Empty
|
|
|
- : $" - {_device.Application.TitleName}";
|
|
|
-
|
|
|
- string titleVersionSection = string.IsNullOrWhiteSpace(_device.Application.DisplayVersion) ? string.Empty
|
|
|
- : $" v{_device.Application.DisplayVersion}";
|
|
|
-
|
|
|
- string titleIdSection = string.IsNullOrWhiteSpace(_device.Application.TitleIdText) ? string.Empty
|
|
|
- : $" ({_device.Application.TitleIdText.ToUpper()})";
|
|
|
-
|
|
|
- string titleArchSection = _device.Application.TitleIs64Bit ? " (64-bit)" : " (32-bit)";
|
|
|
-
|
|
|
- parent.Title = $"Ryujinx {Program.Version}{titleNameSection}{titleVersionSection}{titleIdSection}{titleArchSection}";
|
|
|
- });
|
|
|
-
|
|
|
- Thread renderLoopThread = new Thread(Render)
|
|
|
- {
|
|
|
- Name = "GUI.RenderLoop"
|
|
|
- };
|
|
|
- renderLoopThread.Start();
|
|
|
-
|
|
|
- Thread nvStutterWorkaround = new Thread(NVStutterWorkaround)
|
|
|
- {
|
|
|
- Name = "GUI.NVStutterWorkaround"
|
|
|
- };
|
|
|
- nvStutterWorkaround.Start();
|
|
|
-
|
|
|
- MainLoop();
|
|
|
-
|
|
|
- renderLoopThread.Join();
|
|
|
- nvStutterWorkaround.Join();
|
|
|
-
|
|
|
- Exit();
|
|
|
+ _initializedOpenGL = true;
|
|
|
}
|
|
|
|
|
|
- private void NVStutterWorkaround()
|
|
|
+ private SwappableNativeWindowBase RetrieveNativeWindow()
|
|
|
{
|
|
|
- while (_isActive)
|
|
|
+ if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
|
|
|
{
|
|
|
- // When NVIDIA Threaded Optimization is on, the driver will snapshot all threads in the system whenever the application creates any new ones.
|
|
|
- // The ThreadPool has something called a "GateThread" which terminates itself after some inactivity.
|
|
|
- // However, it immediately starts up again, since the rules regarding when to terminate and when to start differ.
|
|
|
- // This creates a new thread every second or so.
|
|
|
- // The main problem with this is that the thread snapshot can take 70ms, is on the OpenGL thread and will delay rendering any graphics.
|
|
|
- // This is a little over budget on a frame time of 16ms, so creates a large stutter.
|
|
|
- // The solution is to keep the ThreadPool active so that it never has a reason to terminate the GateThread.
|
|
|
-
|
|
|
- // TODO: This should be removed when the issue with the GateThread is resolved.
|
|
|
+ IntPtr windowHandle = gdk_win32_window_get_handle(Window.Handle);
|
|
|
|
|
|
- ThreadPool.QueueUserWorkItem((state) => { });
|
|
|
- Thread.Sleep(300);
|
|
|
+ return new WGLWindow(new NativeHandle(windowHandle));
|
|
|
}
|
|
|
- }
|
|
|
-
|
|
|
- protected override bool OnButtonPressEvent(EventButton evnt)
|
|
|
- {
|
|
|
- _mouseX = evnt.X;
|
|
|
- _mouseY = evnt.Y;
|
|
|
-
|
|
|
- if (evnt.Button == 1)
|
|
|
+ else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
|
|
|
{
|
|
|
- _mousePressed = true;
|
|
|
- }
|
|
|
-
|
|
|
- return false;
|
|
|
- }
|
|
|
+ IntPtr displayHandle = gdk_x11_display_get_xdisplay(Display.Handle);
|
|
|
+ IntPtr windowHandle = gdk_x11_window_get_xid(Window.Handle);
|
|
|
|
|
|
- protected override bool OnButtonReleaseEvent(EventButton evnt)
|
|
|
- {
|
|
|
- if (evnt.Button == 1)
|
|
|
- {
|
|
|
- _mousePressed = false;
|
|
|
- }
|
|
|
-
|
|
|
- return false;
|
|
|
- }
|
|
|
-
|
|
|
- protected override bool OnMotionNotifyEvent(EventMotion evnt)
|
|
|
- {
|
|
|
- if (evnt.Device.InputSource == InputSource.Mouse)
|
|
|
- {
|
|
|
- _mouseX = evnt.X;
|
|
|
- _mouseY = evnt.Y;
|
|
|
- }
|
|
|
-
|
|
|
- if (_hideCursorOnIdle)
|
|
|
- {
|
|
|
- _lastCursorMoveTime = Stopwatch.GetTimestamp();
|
|
|
- }
|
|
|
-
|
|
|
- return false;
|
|
|
- }
|
|
|
-
|
|
|
- protected override void OnGetPreferredHeight(out int minimumHeight, out int naturalHeight)
|
|
|
- {
|
|
|
- Gdk.Monitor monitor = Display.GetMonitorAtWindow(Window);
|
|
|
-
|
|
|
- // If the monitor is at least 1080p, use the Switch panel size as minimal size.
|
|
|
- if (monitor.Geometry.Height >= 1080)
|
|
|
- {
|
|
|
- minimumHeight = SwitchPanelHeight;
|
|
|
- }
|
|
|
- // Otherwise, we default minimal size to 480p 16:9.
|
|
|
- else
|
|
|
- {
|
|
|
- minimumHeight = 480;
|
|
|
- }
|
|
|
-
|
|
|
- naturalHeight = minimumHeight;
|
|
|
- }
|
|
|
-
|
|
|
- protected override void OnGetPreferredWidth(out int minimumWidth, out int naturalWidth)
|
|
|
- {
|
|
|
- Gdk.Monitor monitor = Display.GetMonitorAtWindow(Window);
|
|
|
-
|
|
|
- // If the monitor is at least 1080p, use the Switch panel size as minimal size.
|
|
|
- if (monitor.Geometry.Height >= 1080)
|
|
|
- {
|
|
|
- minimumWidth = SwitchPanelWidth;
|
|
|
- }
|
|
|
- // Otherwise, we default minimal size to 480p 16:9.
|
|
|
- else
|
|
|
- {
|
|
|
- minimumWidth = 854;
|
|
|
+ return new GLXWindow(new NativeHandle(displayHandle), new NativeHandle(windowHandle));
|
|
|
}
|
|
|
|
|
|
- naturalWidth = minimumWidth;
|
|
|
+ throw new NotImplementedException();
|
|
|
}
|
|
|
|
|
|
- public void Exit()
|
|
|
- {
|
|
|
- NpadManager?.Dispose();
|
|
|
-
|
|
|
- if (_isStopped)
|
|
|
- {
|
|
|
- return;
|
|
|
- }
|
|
|
+ [DllImport("libgdk-3-0.dll")]
|
|
|
+ private static extern IntPtr gdk_win32_window_get_handle(IntPtr d);
|
|
|
|
|
|
- _isStopped = true;
|
|
|
- _isActive = false;
|
|
|
+ [DllImport("libgdk-3.so.0")]
|
|
|
+ private static extern IntPtr gdk_x11_display_get_xdisplay(IntPtr gdkDisplay);
|
|
|
|
|
|
- _exitEvent.WaitOne();
|
|
|
- _exitEvent.Dispose();
|
|
|
- }
|
|
|
+ [DllImport("libgdk-3.so.0")]
|
|
|
+ private static extern IntPtr gdk_x11_window_get_xid(IntPtr gdkWindow);
|
|
|
|
|
|
- public void Initialize()
|
|
|
+ private static FramebufferFormat GetGraphicsMode()
|
|
|
{
|
|
|
- if (!(_device.Gpu.Renderer is Renderer))
|
|
|
- {
|
|
|
- throw new NotSupportedException($"GPU renderer must be an OpenGL renderer when using {typeof(Renderer).Name}!");
|
|
|
- }
|
|
|
-
|
|
|
- _renderer = (Renderer)_device.Gpu.Renderer;
|
|
|
+ return Environment.OSVersion.Platform == PlatformID.Unix ? new FramebufferFormat(new ColorFormat(8, 8, 8, 0), 16, 0, ColorFormat.Zero, 0, 2, false) : FramebufferFormat.Default;
|
|
|
}
|
|
|
|
|
|
- public void Render()
|
|
|
+ public override void InitializeRenderer()
|
|
|
{
|
|
|
// First take exclusivity on the OpenGL context.
|
|
|
- _renderer.InitializeBackgroundContext(SPBOpenGLContext.CreateBackgroundContext(OpenGLContext));
|
|
|
-
|
|
|
- Gtk.Window parent = Toplevel as Gtk.Window;
|
|
|
- parent.Present();
|
|
|
+ ((Renderer)Renderer).InitializeBackgroundContext(SPBOpenGLContext.CreateBackgroundContext(_openGLContext));
|
|
|
|
|
|
- OpenGLContext.MakeCurrent(NativeWindow);
|
|
|
+ _openGLContext.MakeCurrent(_nativeWindow);
|
|
|
|
|
|
- _device.Gpu.Renderer.Initialize(_glLogLevel);
|
|
|
-
|
|
|
- // Make sure the first frame is not transparent.
|
|
|
GL.ClearColor(0, 0, 0, 1.0f);
|
|
|
GL.Clear(ClearBufferMask.ColorBufferBit);
|
|
|
SwapBuffers();
|
|
|
-
|
|
|
- _device.Gpu.InitializeShaderCache();
|
|
|
- Translator.IsReadyForTranslation.Set();
|
|
|
-
|
|
|
- while (_isActive)
|
|
|
- {
|
|
|
- if (_isStopped)
|
|
|
- {
|
|
|
- return;
|
|
|
- }
|
|
|
-
|
|
|
- _ticks += _chrono.ElapsedTicks;
|
|
|
-
|
|
|
- _chrono.Restart();
|
|
|
-
|
|
|
- if (_device.WaitFifo())
|
|
|
- {
|
|
|
- _device.Statistics.RecordFifoStart();
|
|
|
- _device.ProcessFrame();
|
|
|
- _device.Statistics.RecordFifoEnd();
|
|
|
- }
|
|
|
-
|
|
|
- while (_device.ConsumeFrameAvailable())
|
|
|
- {
|
|
|
- _device.PresentFrame(SwapBuffers);
|
|
|
- }
|
|
|
-
|
|
|
- if (_ticks >= _ticksPerFrame)
|
|
|
- {
|
|
|
- string dockedMode = ConfigurationState.Instance.System.EnableDockedMode ? "Docked" : "Handheld";
|
|
|
- float scale = Graphics.Gpu.GraphicsConfig.ResScale;
|
|
|
- if (scale != 1)
|
|
|
- {
|
|
|
- dockedMode += $" ({scale}x)";
|
|
|
- }
|
|
|
-
|
|
|
- StatusUpdatedEvent?.Invoke(this, new StatusUpdatedEventArgs(
|
|
|
- _device.EnableDeviceVsync,
|
|
|
- dockedMode,
|
|
|
- ConfigurationState.Instance.Graphics.AspectRatio.Value.ToText(),
|
|
|
- $"Game: {_device.Statistics.GetGameFrameRate():00.00} FPS",
|
|
|
- $"FIFO: {_device.Statistics.GetFifoPercent():0.00} %",
|
|
|
- $"GPU: {_renderer.GpuVendor}"));
|
|
|
-
|
|
|
- _ticks = Math.Min(_ticks - _ticksPerFrame, _ticksPerFrame);
|
|
|
- }
|
|
|
- }
|
|
|
}
|
|
|
|
|
|
- public void SwapBuffers()
|
|
|
+ public override void SwapBuffers()
|
|
|
{
|
|
|
- NativeWindow.SwapBuffers();
|
|
|
+ _nativeWindow.SwapBuffers();
|
|
|
}
|
|
|
|
|
|
- public void MainLoop()
|
|
|
+ public override string GetGpuVendorName()
|
|
|
{
|
|
|
- while (_isActive)
|
|
|
- {
|
|
|
- UpdateFrame();
|
|
|
-
|
|
|
- // Polling becomes expensive if it's not slept
|
|
|
- Thread.Sleep(1);
|
|
|
- }
|
|
|
-
|
|
|
- _exitEvent.Set();
|
|
|
+ return ((Renderer)Renderer).GpuVendor;
|
|
|
}
|
|
|
|
|
|
- private bool UpdateFrame()
|
|
|
+ protected override void Dispose(bool disposing)
|
|
|
{
|
|
|
- if (!_isActive)
|
|
|
- {
|
|
|
- return true;
|
|
|
- }
|
|
|
-
|
|
|
- if (_isStopped)
|
|
|
- {
|
|
|
- return false;
|
|
|
- }
|
|
|
-
|
|
|
- if (_isFocused)
|
|
|
- {
|
|
|
- Gtk.Application.Invoke(delegate
|
|
|
- {
|
|
|
- KeyboardStateSnapshot keyboard = _keyboardInterface.GetKeyboardStateSnapshot();
|
|
|
-
|
|
|
- HandleScreenState(keyboard);
|
|
|
-
|
|
|
- if (keyboard.IsPressed(Key.Delete))
|
|
|
- {
|
|
|
- if (!ParentWindow.State.HasFlag(WindowState.Fullscreen))
|
|
|
- {
|
|
|
- Ptc.Continue();
|
|
|
- }
|
|
|
- }
|
|
|
- });
|
|
|
- }
|
|
|
-
|
|
|
- NpadManager.Update(_device.Hid, _device.TamperMachine);
|
|
|
-
|
|
|
- if(_isFocused)
|
|
|
- {
|
|
|
- KeyboardHotkeyState currentHotkeyState = GetHotkeyState();
|
|
|
-
|
|
|
- if (currentHotkeyState.HasFlag(KeyboardHotkeyState.ToggleVSync) &&
|
|
|
- !_prevHotkeyState.HasFlag(KeyboardHotkeyState.ToggleVSync))
|
|
|
- {
|
|
|
- _device.EnableDeviceVsync = !_device.EnableDeviceVsync;
|
|
|
- }
|
|
|
-
|
|
|
- _prevHotkeyState = currentHotkeyState;
|
|
|
- }
|
|
|
-
|
|
|
- //Touchscreen
|
|
|
- bool hasTouch = false;
|
|
|
-
|
|
|
- // Get screen touch position from left mouse click
|
|
|
- // OpenTK always captures mouse events, even if out of focus, so check if window is focused.
|
|
|
- if (_isFocused && _mousePressed)
|
|
|
- {
|
|
|
- float aspectWidth = SwitchPanelHeight * ConfigurationState.Instance.Graphics.AspectRatio.Value.ToFloat();
|
|
|
-
|
|
|
- int screenWidth = AllocatedWidth;
|
|
|
- int screenHeight = AllocatedHeight;
|
|
|
-
|
|
|
- if (AllocatedWidth > AllocatedHeight * aspectWidth / SwitchPanelHeight)
|
|
|
- {
|
|
|
- screenWidth = (int)(AllocatedHeight * aspectWidth) / SwitchPanelHeight;
|
|
|
- }
|
|
|
- else
|
|
|
- {
|
|
|
- screenHeight = (AllocatedWidth * SwitchPanelHeight) / (int)aspectWidth;
|
|
|
- }
|
|
|
-
|
|
|
- int startX = (AllocatedWidth - screenWidth) >> 1;
|
|
|
- int startY = (AllocatedHeight - screenHeight) >> 1;
|
|
|
-
|
|
|
- int endX = startX + screenWidth;
|
|
|
- int endY = startY + screenHeight;
|
|
|
-
|
|
|
-
|
|
|
- if (_mouseX >= startX &&
|
|
|
- _mouseY >= startY &&
|
|
|
- _mouseX < endX &&
|
|
|
- _mouseY < endY)
|
|
|
- {
|
|
|
- int screenMouseX = (int)_mouseX - startX;
|
|
|
- int screenMouseY = (int)_mouseY - startY;
|
|
|
-
|
|
|
- int mX = (screenMouseX * (int)aspectWidth) / screenWidth;
|
|
|
- int mY = (screenMouseY * SwitchPanelHeight) / screenHeight;
|
|
|
-
|
|
|
- TouchPoint currentPoint = new TouchPoint
|
|
|
- {
|
|
|
- X = (uint)mX,
|
|
|
- Y = (uint)mY,
|
|
|
-
|
|
|
- // Placeholder values till more data is acquired
|
|
|
- DiameterX = 10,
|
|
|
- DiameterY = 10,
|
|
|
- Angle = 90
|
|
|
- };
|
|
|
-
|
|
|
- hasTouch = true;
|
|
|
-
|
|
|
- _device.Hid.Touchscreen.Update(currentPoint);
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- if (!hasTouch)
|
|
|
+ // Try to bind the OpenGL context before calling the shutdown event
|
|
|
+ try
|
|
|
{
|
|
|
- _device.Hid.Touchscreen.Update();
|
|
|
+ _openGLContext?.MakeCurrent(_nativeWindow);
|
|
|
}
|
|
|
+ catch (Exception) { }
|
|
|
|
|
|
- _device.Hid.DebugPad.Update();
|
|
|
-
|
|
|
- return true;
|
|
|
- }
|
|
|
-
|
|
|
- [Flags]
|
|
|
- private enum KeyboardHotkeyState
|
|
|
- {
|
|
|
- None,
|
|
|
- ToggleVSync
|
|
|
- }
|
|
|
-
|
|
|
- private KeyboardHotkeyState GetHotkeyState()
|
|
|
- {
|
|
|
- KeyboardHotkeyState state = KeyboardHotkeyState.None;
|
|
|
+ Device.DisposeGpu();
|
|
|
+ NpadManager.Dispose();
|
|
|
|
|
|
- if (_keyboardInterface.IsPressed((Key)ConfigurationState.Instance.Hid.Hotkeys.Value.ToggleVsync))
|
|
|
+ // Unbind context and destroy everything
|
|
|
+ try
|
|
|
{
|
|
|
- state |= KeyboardHotkeyState.ToggleVSync;
|
|
|
+ _openGLContext?.MakeCurrent(null);
|
|
|
}
|
|
|
+ catch (Exception) { }
|
|
|
|
|
|
- return state;
|
|
|
+ _openGLContext.Dispose();
|
|
|
}
|
|
|
}
|
|
|
}
|