mirror of
https://github.com/ryujinx-mirror/ryujinx.git
synced 2024-11-29 21:43:01 +00:00
faac08e638
* gtk3: Add base for future Vulkan integration This PR puts in place the fondation for the future Vulkan integration on the GTK3 UI. This also updated SPB to 0.0.3-build14 that fixed a use after free on XErrorHandler on Linux. * Address rip's comments * Merge GLWidget inside GLRenderer * Clean up and deduplicate renderer implementations * Address shahil's comments * Address Ac_K's comments * Address gdkchan's comments
80 lines
2.4 KiB
C#
80 lines
2.4 KiB
C#
using Gdk;
|
|
using Gtk;
|
|
using Ryujinx.Common.Configuration;
|
|
using Ryujinx.Input.HLE;
|
|
using SPB.Graphics.Vulkan;
|
|
using SPB.Platform.Win32;
|
|
using SPB.Platform.X11;
|
|
using SPB.Windowing;
|
|
using System;
|
|
using System.Runtime.InteropServices;
|
|
|
|
namespace Ryujinx.Ui
|
|
{
|
|
public class VKRenderer : RendererWidgetBase
|
|
{
|
|
public NativeWindowBase NativeWindow { get; private set; }
|
|
|
|
public VKRenderer(InputManager inputManager, GraphicsDebugLevel glLogLevel) : base(inputManager, glLogLevel) { }
|
|
|
|
private NativeWindowBase RetrieveNativeWindow()
|
|
{
|
|
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
|
|
{
|
|
IntPtr windowHandle = gdk_win32_window_get_handle(Window.Handle);
|
|
|
|
return new SimpleWin32Window(new NativeHandle(windowHandle));
|
|
}
|
|
else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
|
|
{
|
|
IntPtr displayHandle = gdk_x11_display_get_xdisplay(Display.Handle);
|
|
IntPtr windowHandle = gdk_x11_window_get_xid(Window.Handle);
|
|
|
|
return new SimpleX11Window(new NativeHandle(displayHandle), new NativeHandle(windowHandle));
|
|
}
|
|
|
|
throw new NotImplementedException();
|
|
}
|
|
|
|
[DllImport("libgdk-3-0.dll")]
|
|
private static extern IntPtr gdk_win32_window_get_handle(IntPtr d);
|
|
|
|
[DllImport("libgdk-3.so.0")]
|
|
private static extern IntPtr gdk_x11_display_get_xdisplay(IntPtr gdkDisplay);
|
|
|
|
[DllImport("libgdk-3.so.0")]
|
|
private static extern IntPtr gdk_x11_window_get_xid(IntPtr gdkWindow);
|
|
|
|
protected override bool OnConfigureEvent(EventConfigure evnt)
|
|
{
|
|
if (NativeWindow == null)
|
|
{
|
|
NativeWindow = RetrieveNativeWindow();
|
|
|
|
WaitEvent.Set();
|
|
}
|
|
|
|
return base.OnConfigureEvent(evnt);
|
|
}
|
|
|
|
public unsafe IntPtr CreateWindowSurface(IntPtr instance)
|
|
{
|
|
return VulkanHelper.CreateWindowSurface(instance, NativeWindow);
|
|
}
|
|
|
|
public override void InitializeRenderer() { }
|
|
|
|
public override void SwapBuffers() { }
|
|
|
|
public override string GetGpuVendorName()
|
|
{
|
|
return "Vulkan (Unknown)";
|
|
}
|
|
|
|
protected override void Dispose(bool disposing)
|
|
{
|
|
Device.DisposeGpu();
|
|
NpadManager.Dispose();
|
|
}
|
|
}
|
|
}
|