N-archive/Ryujinx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Improve rendering on resolution lower than 1080p (#944)

Browse source 
* Improve rendering on resolution lower than 1080p

* Apply scaling factor to the renderer (This fix 4K displays)
This commit is contained in:
Thog 2020-02-18 12:34:57 +01:00 committed by GitHub
parent d736352da2
commit 5f6949d9b0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 54 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
Ryujinx/Ui/GLRenderer.cs
View file

@ -18,8 +18,8 @@ namespace Ryujinx.Ui
{ {
public class GLRenderer : GLWidget public class GLRenderer : GLWidget
{ {
private const int TouchScreenWidth = 1280; private const int SwitchPanelWidth = 1280;
private const int TouchScreenHeight = 720; private const int SwitchPanelHeight = 720;
private const int TargetFps = 60; private const int TargetFps = 60;
public ManualResetEvent WaitEvent { get; set; } public ManualResetEvent WaitEvent { get; set; }
@ -52,9 +52,9 @@ namespace Ryujinx.Ui
private Input.NpadController _primaryController; private Input.NpadController _primaryController;
public GLRenderer(Switch device) public GLRenderer(Switch device)
: base (new GraphicsMode(new ColorFormat()), : base (new GraphicsMode(new ColorFormat()),
3, 3, 3, 3,
GraphicsContextFlags.ForwardCompatible) GraphicsContextFlags.ForwardCompatible)
{ {
WaitEvent = new ManualResetEvent(false); WaitEvent = new ManualResetEvent(false);
@ -73,9 +73,9 @@ namespace Ryujinx.Ui
_primaryController = new Input.NpadController(ConfigurationState.Instance.Hid.JoystickControls); _primaryController = new Input.NpadController(ConfigurationState.Instance.Hid.JoystickControls);
AddEvents((int)(Gdk.EventMask.ButtonPressMask AddEvents((int)(Gdk.EventMask.ButtonPressMask
| Gdk.EventMask.ButtonReleaseMask | Gdk.EventMask.ButtonReleaseMask
| Gdk.EventMask.PointerMotionMask | Gdk.EventMask.PointerMotionMask
| Gdk.EventMask.KeyPressMask | Gdk.EventMask.KeyPressMask
| Gdk.EventMask.KeyReleaseMask)); | Gdk.EventMask.KeyReleaseMask));
@ -109,9 +109,9 @@ namespace Ryujinx.Ui
public void HandleScreenState(KeyboardState keyboard) public void HandleScreenState(KeyboardState keyboard)
{ {
bool toggleFullscreen = keyboard.IsKeyDown(OpenTK.Input.Key.F11) bool toggleFullscreen = keyboard.IsKeyDown(OpenTK.Input.Key.F11)
|| ((keyboard.IsKeyDown(OpenTK.Input.Key.AltLeft) || ((keyboard.IsKeyDown(OpenTK.Input.Key.AltLeft)
|| keyboard.IsKeyDown(OpenTK.Input.Key.AltRight)) || keyboard.IsKeyDown(OpenTK.Input.Key.AltRight))
&& keyboard.IsKeyDown(OpenTK.Input.Key.Enter)) && keyboard.IsKeyDown(OpenTK.Input.Key.Enter))
|| keyboard.IsKeyDown(OpenTK.Input.Key.Escape); || keyboard.IsKeyDown(OpenTK.Input.Key.Escape);
@ -156,7 +156,9 @@ namespace Ryujinx.Ui
{ {
var result = base.OnConfigureEvent(evnt); var result = base.OnConfigureEvent(evnt);
_renderer.Window.SetSize(AllocatedWidth, AllocatedHeight); Gdk.Monitor monitor = Display.GetMonitorAtWindow(Window);
_renderer.Window.SetSize(evnt.Width * monitor.ScaleFactor, evnt.Height * monitor.ScaleFactor);
return result; return result;
} }
@ -226,6 +228,42 @@ namespace Ryujinx.Ui
return false; 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() public void Exit()
{ {
if (IsStopped) if (IsStopped)
@ -421,13 +459,13 @@ namespace Ryujinx.Ui
int screenWidth = AllocatedWidth; int screenWidth = AllocatedWidth;
int screenHeight = AllocatedHeight; int screenHeight = AllocatedHeight;
if (AllocatedWidth > (AllocatedHeight * TouchScreenWidth) / TouchScreenHeight) if (AllocatedWidth > (AllocatedHeight * SwitchPanelWidth) / SwitchPanelHeight)
{ {
screenWidth = (AllocatedHeight * TouchScreenWidth) / TouchScreenHeight; screenWidth = (AllocatedHeight * SwitchPanelWidth) / SwitchPanelHeight;
} }
else else
{ {
screenHeight = (AllocatedWidth * TouchScreenHeight) / TouchScreenWidth; screenHeight = (AllocatedWidth * SwitchPanelHeight) / SwitchPanelWidth;
} }
int startX = (AllocatedWidth - screenWidth) >> 1; int startX = (AllocatedWidth - screenWidth) >> 1;
@ -445,8 +483,8 @@ namespace Ryujinx.Ui
int screenMouseX = (int)_mouseX - startX; int screenMouseX = (int)_mouseX - startX;
int screenMouseY = (int)_mouseY - startY; int screenMouseY = (int)_mouseY - startY;
int mX = (screenMouseX * TouchScreenWidth) / screenWidth; int mX = (screenMouseX * SwitchPanelWidth) / screenWidth;
int mY = (screenMouseY * TouchScreenHeight) / screenHeight; int mY = (screenMouseY * SwitchPanelHeight) / screenHeight;
TouchPoint currentPoint = new TouchPoint TouchPoint currentPoint = new TouchPoint
{ {

2
Ryujinx/Ui/MainWindow.glade
View file

@ -363,8 +363,6 @@
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<child> <child>
<object class="GtkBox" id="_viewBox"> <object class="GtkBox" id="_viewBox">
<property name="width_request">1280</property>
<property name="height_request">720</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="orientation">vertical</property> <property name="orientation">vertical</property>