From ec6cb0abb4b7669895b6e96fd7581c93b5abd691 Mon Sep 17 00:00:00 2001
From: Mary Guillemard <mary@mary.zone>
Date: Sat, 2 Mar 2024 12:51:05 +0100
Subject: infra: Make Avalonia the default UI (#6375)
* misc: Move Ryujinx project to Ryujinx.Gtk3
This breaks release CI for now but that's fine.
Signed-off-by: Mary Guillemard <mary@mary.zone>
* misc: Move Ryujinx.Ava project to Ryujinx
This breaks CI for now, but it's fine.
Signed-off-by: Mary Guillemard <mary@mary.zone>
* infra: Make Avalonia the default UI
Should fix CI after the previous changes.
GTK3 isn't build by the release job anymore, only by PR CI.
This also ensure that the test-ava update package is still generated to
allow update from the old testing channel.
Signed-off-by: Mary Guillemard <mary@mary.zone>
* Fix missing copy in create_app_bundle.sh
Signed-off-by: Mary Guillemard <mary@mary.zone>
* Fix syntax error
Signed-off-by: Mary Guillemard <mary@mary.zone>
---------
Signed-off-by: Mary Guillemard <mary@mary.zone>
---
src/Ryujinx/UI/Renderer/EmbeddedWindowVulkan.cs | 42 +++++++++++++++++++++++++
1 file changed, 42 insertions(+)
create mode 100644 src/Ryujinx/UI/Renderer/EmbeddedWindowVulkan.cs
(limited to 'src/Ryujinx/UI/Renderer/EmbeddedWindowVulkan.cs')
diff --git a/src/Ryujinx/UI/Renderer/EmbeddedWindowVulkan.cs b/src/Ryujinx/UI/Renderer/EmbeddedWindowVulkan.cs
new file mode 100644
index 00000000..fafbec20
--- /dev/null
+++ b/src/Ryujinx/UI/Renderer/EmbeddedWindowVulkan.cs
@@ -0,0 +1,42 @@
+using Silk.NET.Vulkan;
+using SPB.Graphics.Vulkan;
+using SPB.Platform.Metal;
+using SPB.Platform.Win32;
+using SPB.Platform.X11;
+using SPB.Windowing;
+using System;
+
+namespace Ryujinx.Ava.UI.Renderer
+{
+ public class EmbeddedWindowVulkan : EmbeddedWindow
+ {
+ public SurfaceKHR CreateSurface(Instance instance)
+ {
+ NativeWindowBase nativeWindowBase;
+
+ if (OperatingSystem.IsWindows())
+ {
+ nativeWindowBase = new SimpleWin32Window(new NativeHandle(WindowHandle));
+ }
+ else if (OperatingSystem.IsLinux())
+ {
+ nativeWindowBase = new SimpleX11Window(new NativeHandle(X11Display), new NativeHandle(WindowHandle));
+ }
+ else if (OperatingSystem.IsMacOS())
+ {
+ nativeWindowBase = new SimpleMetalWindow(new NativeHandle(NsView), new NativeHandle(MetalLayer));
+ }
+ else
+ {
+ throw new PlatformNotSupportedException();
+ }
+
+ return new SurfaceKHR((ulong?)VulkanHelper.CreateWindowSurface(instance.Handle, nativeWindowBase));
+ }
+
+ public SurfaceKHR CreateSurface(Instance instance, Vk _)
+ {
+ return CreateSurface(instance);
+ }
+ }
+}
--
cgit v1.2.3-70-g09d2