36749c358d
* Rewrite SurfaceFlinger Reimplement accurately SurfaceFlinger (based on my 8.1.0 reversing of it) TODO: support swap interval properly and reintroduce disabled "game vsync" support. * Some fixes for SetBufferCount * uncomment a test from last commit * SurfaceFlinger: don't free the graphic buffer in SetBufferCount * SurfaceFlinger: Implement swap interval correctly * SurfaceFlinger: Reintegrate Game VSync toggle * SurfaceFlinger: do not push a fence on buffer release on the consumer side * Revert "SurfaceFlinger: do not push a fence on buffer release on the consumer side" This reverts commit 586b52b0bfab2d11f361f4b59ab7b7141020bbad. * Make the game vsync toggle work dynamically again * Unregister producer's Binder object when closing layer * Address ripinperi's comments * Add a timeout on syncpoint wait operation Syncpoint aren't supposed to be waited on for more than a second. This effectively workaround issues caused by not having a channel scheduling in place yet. PS: Also introduce Android WaitForever warning about fence being not signaled for 3s * Fix a print of previous commit * Address Ac_K's comments * Address gdkchan's comments * Address final comments
541 lines
17 KiB
C#
541 lines
17 KiB
C#
using Gdk;
|
|
using OpenTK;
|
|
using OpenTK.Graphics;
|
|
using OpenTK.Graphics.OpenGL;
|
|
using OpenTK.Input;
|
|
using OpenTK.Platform;
|
|
using Ryujinx.Configuration;
|
|
using Ryujinx.Graphics.OpenGL;
|
|
using Ryujinx.HLE;
|
|
using Ryujinx.HLE.HOS.Services.Hid;
|
|
using Ryujinx.Ui;
|
|
using System;
|
|
using System.Collections.Generic;
|
|
using System.Text;
|
|
using System.Threading;
|
|
|
|
namespace Ryujinx.Ui
|
|
{
|
|
public class GLRenderer : GLWidget
|
|
{
|
|
private const int SwitchPanelWidth = 1280;
|
|
private const int SwitchPanelHeight = 720;
|
|
private const int TargetFps = 60;
|
|
|
|
public ManualResetEvent WaitEvent { get; set; }
|
|
|
|
public static event EventHandler<StatusUpdatedEventArgs> StatusUpdatedEvent;
|
|
|
|
public bool IsActive { get; set; }
|
|
public bool IsStopped { get; set; }
|
|
public bool IsFocused { get; set; }
|
|
|
|
private double _mouseX;
|
|
private double _mouseY;
|
|
private bool _mousePressed;
|
|
|
|
private bool _toggleFullscreen;
|
|
|
|
private readonly long _ticksPerFrame;
|
|
|
|
private long _ticks = 0;
|
|
|
|
private System.Diagnostics.Stopwatch _chrono;
|
|
|
|
private Switch _device;
|
|
|
|
private Renderer _renderer;
|
|
|
|
private HotkeyButtons _prevHotkeyButtons = 0;
|
|
|
|
private Input.NpadController _primaryController;
|
|
|
|
public GLRenderer(Switch device)
|
|
: base (GetGraphicsMode(),
|
|
3, 3,
|
|
GraphicsContextFlags.ForwardCompatible)
|
|
{
|
|
WaitEvent = new ManualResetEvent(false);
|
|
|
|
_device = device;
|
|
|
|
this.Initialized += GLRenderer_Initialized;
|
|
this.Destroyed += GLRenderer_Destroyed;
|
|
this.ShuttingDown += GLRenderer_ShuttingDown;
|
|
|
|
Initialize();
|
|
|
|
_chrono = new System.Diagnostics.Stopwatch();
|
|
|
|
_ticksPerFrame = System.Diagnostics.Stopwatch.Frequency / TargetFps;
|
|
|
|
_primaryController = new Input.NpadController(ConfigurationState.Instance.Hid.JoystickControls);
|
|
|
|
AddEvents((int)(Gdk.EventMask.ButtonPressMask
|
|
| Gdk.EventMask.ButtonReleaseMask
|
|
| Gdk.EventMask.PointerMotionMask
|
|
| Gdk.EventMask.KeyPressMask
|
|
| Gdk.EventMask.KeyReleaseMask));
|
|
|
|
this.Shown += Renderer_Shown;
|
|
}
|
|
|
|
private static GraphicsMode GetGraphicsMode()
|
|
{
|
|
if (Environment.OSVersion.Platform == PlatformID.Unix)
|
|
{
|
|
return new GraphicsMode(new ColorFormat(24));
|
|
}
|
|
|
|
return new GraphicsMode(new ColorFormat());
|
|
}
|
|
|
|
private void GLRenderer_ShuttingDown(object sender, EventArgs args)
|
|
{
|
|
_device.DisposeGpu();
|
|
}
|
|
|
|
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)
|
|
{
|
|
Dispose();
|
|
}
|
|
|
|
protected void Renderer_Shown(object sender, EventArgs e)
|
|
{
|
|
IsFocused = this.ParentWindow.State.HasFlag(Gdk.WindowState.Focused);
|
|
}
|
|
|
|
public void HandleScreenState(KeyboardState keyboard)
|
|
{
|
|
bool toggleFullscreen = keyboard.IsKeyDown(OpenTK.Input.Key.F11)
|
|
|| ((keyboard.IsKeyDown(OpenTK.Input.Key.AltLeft)
|
|
|| keyboard.IsKeyDown(OpenTK.Input.Key.AltRight))
|
|
&& keyboard.IsKeyDown(OpenTK.Input.Key.Enter))
|
|
|| keyboard.IsKeyDown(OpenTK.Input.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.IsKeyDown(OpenTK.Input.Key.Escape))
|
|
{
|
|
if (GtkDialog.CreateExitDialog())
|
|
{
|
|
Exit();
|
|
}
|
|
}
|
|
else
|
|
{
|
|
ParentWindow.Fullscreen();
|
|
(Toplevel as MainWindow)?.ToggleExtraWidgets(false);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
_toggleFullscreen = toggleFullscreen;
|
|
}
|
|
|
|
private void GLRenderer_Initialized(object sender, EventArgs e)
|
|
{
|
|
// Release the GL exclusivity that OpenTK gave us as we aren't going to use it in GTK Thread.
|
|
GraphicsContext.MakeCurrent(null);
|
|
|
|
WaitEvent.Set();
|
|
}
|
|
|
|
protected override bool OnConfigureEvent(EventConfigure evnt)
|
|
{
|
|
var 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()
|
|
{
|
|
IsRenderHandler = true;
|
|
|
|
_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.System.TitleName) ? string.Empty
|
|
: $" - {_device.System.TitleName}";
|
|
|
|
string titleVersionSection = string.IsNullOrWhiteSpace(_device.System.TitleVersionString) ? string.Empty
|
|
: $" v{_device.System.TitleVersionString}";
|
|
|
|
string titleIdSection = string.IsNullOrWhiteSpace(_device.System.TitleIdText) ? string.Empty
|
|
: $" ({_device.System.TitleIdText.ToUpper()})";
|
|
|
|
string titleArchSection = _device.System.TitleIs64Bit ? " (64-bit)" : " (32-bit)";
|
|
|
|
parent.Title = $"Ryujinx {Program.Version}{titleNameSection}{titleVersionSection}{titleIdSection}{titleArchSection}";
|
|
});
|
|
|
|
Thread renderLoopThread = new Thread(Render)
|
|
{
|
|
Name = "GUI.RenderLoop"
|
|
};
|
|
renderLoopThread.Start();
|
|
|
|
MainLoop();
|
|
|
|
renderLoopThread.Join();
|
|
|
|
Exit();
|
|
}
|
|
|
|
protected override bool OnButtonPressEvent(EventButton evnt)
|
|
{
|
|
_mouseX = evnt.X;
|
|
_mouseY = evnt.Y;
|
|
|
|
if (evnt.Button == 1)
|
|
{
|
|
_mousePressed = true;
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
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;
|
|
}
|
|
|
|
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;
|
|
}
|
|
|
|
naturalWidth = minimumWidth;
|
|
}
|
|
|
|
public void Exit()
|
|
{
|
|
if (IsStopped)
|
|
{
|
|
return;
|
|
}
|
|
|
|
IsStopped = true;
|
|
IsActive = false;
|
|
}
|
|
|
|
public void Initialize()
|
|
{
|
|
if (!(_device.Gpu.Renderer is Renderer))
|
|
{
|
|
throw new NotSupportedException($"GPU renderer must be an OpenGL renderer when using GLRenderer!");
|
|
}
|
|
|
|
_renderer = (Renderer)_device.Gpu.Renderer;
|
|
}
|
|
|
|
public void Render()
|
|
{
|
|
// First take exclusivity on the OpenGL context.
|
|
GraphicsContext.MakeCurrent(WindowInfo);
|
|
|
|
_renderer.Initialize();
|
|
|
|
// Make sure the first frame is not transparent.
|
|
GL.ClearColor(OpenTK.Color.Black);
|
|
GL.Clear(ClearBufferMask.ColorBufferBit);
|
|
SwapBuffers();
|
|
|
|
while (IsActive)
|
|
{
|
|
if (IsStopped)
|
|
{
|
|
return;
|
|
}
|
|
|
|
_ticks += _chrono.ElapsedTicks;
|
|
|
|
_chrono.Restart();
|
|
|
|
if (_device.WaitFifo())
|
|
{
|
|
_device.ProcessFrame();
|
|
}
|
|
|
|
if (_ticks >= _ticksPerFrame)
|
|
{
|
|
_device.PresentFrame(SwapBuffers);
|
|
|
|
_device.Statistics.RecordSystemFrameTime();
|
|
|
|
StatusUpdatedEvent?.Invoke(this, new StatusUpdatedEventArgs(
|
|
_device.EnableDeviceVsync,
|
|
$"Host: {_device.Statistics.GetSystemFrameRate():00.00} FPS",
|
|
$"Game: {_device.Statistics.GetGameFrameRate():00.00} FPS",
|
|
$"GPU: {_renderer.GpuVendor}"));
|
|
|
|
_ticks = Math.Min(_ticks - _ticksPerFrame, _ticksPerFrame);
|
|
}
|
|
}
|
|
}
|
|
|
|
public void SwapBuffers()
|
|
{
|
|
OpenTK.Graphics.GraphicsContext.CurrentContext.SwapBuffers();
|
|
}
|
|
|
|
public void MainLoop()
|
|
{
|
|
while (IsActive)
|
|
{
|
|
UpdateFrame();
|
|
|
|
// Polling becomes expensive if it's not slept
|
|
Thread.Sleep(1);
|
|
}
|
|
}
|
|
|
|
private bool UpdateFrame()
|
|
{
|
|
if (!IsActive)
|
|
{
|
|
return true;
|
|
}
|
|
|
|
if (IsStopped)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
HotkeyButtons currentHotkeyButtons = 0;
|
|
ControllerKeys currentButton = 0;
|
|
JoystickPosition leftJoystick;
|
|
JoystickPosition rightJoystick;
|
|
KeyboardInput? hidKeyboard = null;
|
|
|
|
int leftJoystickDx = 0;
|
|
int leftJoystickDy = 0;
|
|
int rightJoystickDx = 0;
|
|
int rightJoystickDy = 0;
|
|
|
|
// OpenTK always captures keyboard events, even if out of focus, so check if window is focused.
|
|
if (IsFocused)
|
|
{
|
|
KeyboardState keyboard = OpenTK.Input.Keyboard.GetState();
|
|
|
|
Gtk.Application.Invoke(delegate
|
|
{
|
|
HandleScreenState(keyboard);
|
|
});
|
|
|
|
// Normal Input
|
|
currentHotkeyButtons = KeyboardControls.GetHotkeyButtons(ConfigurationState.Instance.Hid.KeyboardControls, keyboard);
|
|
currentButton = KeyboardControls.GetButtons(ConfigurationState.Instance.Hid.KeyboardControls, keyboard);
|
|
|
|
if (ConfigurationState.Instance.Hid.EnableKeyboard)
|
|
{
|
|
hidKeyboard = KeyboardControls.GetKeysDown(ConfigurationState.Instance.Hid.KeyboardControls, keyboard);
|
|
}
|
|
|
|
(leftJoystickDx, leftJoystickDy) = KeyboardControls.GetLeftStick(ConfigurationState.Instance.Hid.KeyboardControls, keyboard);
|
|
(rightJoystickDx, rightJoystickDy) = KeyboardControls.GetRightStick(ConfigurationState.Instance.Hid.KeyboardControls, keyboard);
|
|
}
|
|
|
|
if (!hidKeyboard.HasValue)
|
|
{
|
|
hidKeyboard = new KeyboardInput
|
|
{
|
|
Modifier = 0,
|
|
Keys = new int[0x8]
|
|
};
|
|
}
|
|
|
|
currentButton |= _primaryController.GetButtons();
|
|
|
|
// Keyboard has priority stick-wise
|
|
if (leftJoystickDx == 0 && leftJoystickDy == 0)
|
|
{
|
|
(leftJoystickDx, leftJoystickDy) = _primaryController.GetLeftStick();
|
|
}
|
|
|
|
if (rightJoystickDx == 0 && rightJoystickDy == 0)
|
|
{
|
|
(rightJoystickDx, rightJoystickDy) = _primaryController.GetRightStick();
|
|
}
|
|
|
|
leftJoystick = new JoystickPosition
|
|
{
|
|
Dx = leftJoystickDx,
|
|
Dy = leftJoystickDy
|
|
};
|
|
|
|
rightJoystick = new JoystickPosition
|
|
{
|
|
Dx = rightJoystickDx,
|
|
Dy = rightJoystickDy
|
|
};
|
|
|
|
currentButton |= _device.Hid.UpdateStickButtons(leftJoystick, rightJoystick);
|
|
|
|
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)
|
|
{
|
|
int screenWidth = AllocatedWidth;
|
|
int screenHeight = AllocatedHeight;
|
|
|
|
if (AllocatedWidth > (AllocatedHeight * SwitchPanelWidth) / SwitchPanelHeight)
|
|
{
|
|
screenWidth = (AllocatedHeight * SwitchPanelWidth) / SwitchPanelHeight;
|
|
}
|
|
else
|
|
{
|
|
screenHeight = (AllocatedWidth * SwitchPanelHeight) / SwitchPanelWidth;
|
|
}
|
|
|
|
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 * SwitchPanelWidth) / 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)
|
|
{
|
|
_device.Hid.Touchscreen.Update();
|
|
}
|
|
|
|
if (ConfigurationState.Instance.Hid.EnableKeyboard && hidKeyboard.HasValue)
|
|
{
|
|
_device.Hid.Keyboard.Update(hidKeyboard.Value);
|
|
}
|
|
|
|
_device.Hid.DebugPad.Update();
|
|
|
|
_device.Hid.Npads.SetGamepadsInput(new GamepadInput
|
|
{
|
|
PlayerId = PlayerIndex.Auto,
|
|
Buttons = currentButton,
|
|
LStick = leftJoystick,
|
|
RStick = rightJoystick
|
|
});
|
|
|
|
// Toggle vsync
|
|
if (currentHotkeyButtons.HasFlag(HotkeyButtons.ToggleVSync) &&
|
|
!_prevHotkeyButtons.HasFlag(HotkeyButtons.ToggleVSync))
|
|
{
|
|
_device.EnableDeviceVsync = !_device.EnableDeviceVsync;
|
|
}
|
|
|
|
_prevHotkeyButtons = currentHotkeyButtons;
|
|
|
|
return true;
|
|
}
|
|
}
|
|
}
|