aboutsummaryrefslogtreecommitdiff
path: root/Ryujinx.Ava/UI/Helpers
diff options
context:
space:
mode:
Diffstat (limited to 'Ryujinx.Ava/UI/Helpers')
-rw-r--r--Ryujinx.Ava/UI/Helpers/EmbeddedWindow.cs5
-rw-r--r--Ryujinx.Ava/UI/Helpers/LoggerAdapter.cs111
-rw-r--r--Ryujinx.Ava/UI/Helpers/MetalHelper.cs127
3 files changed, 240 insertions, 3 deletions
diff --git a/Ryujinx.Ava/UI/Helpers/EmbeddedWindow.cs b/Ryujinx.Ava/UI/Helpers/EmbeddedWindow.cs
index bdeceaea..8247a89b 100644
--- a/Ryujinx.Ava/UI/Helpers/EmbeddedWindow.cs
+++ b/Ryujinx.Ava/UI/Helpers/EmbeddedWindow.cs
@@ -2,7 +2,6 @@ using Avalonia;
using Avalonia.Controls;
using Avalonia.Input;
using Avalonia.Platform;
-using Ryujinx.Ava.UI.Helper;
using SPB.Graphics;
using SPB.Platform;
using SPB.Platform.GLX;
@@ -148,9 +147,9 @@ namespace Ryujinx.Ava.UI.Helpers
IntPtr.Zero);
WindowHandle = handle;
-
+
Marshal.FreeHGlobal(wndClassEx.lpszClassName);
-
+
return new PlatformHandle(WindowHandle, "HWND");
}
diff --git a/Ryujinx.Ava/UI/Helpers/LoggerAdapter.cs b/Ryujinx.Ava/UI/Helpers/LoggerAdapter.cs
new file mode 100644
index 00000000..ba251f60
--- /dev/null
+++ b/Ryujinx.Ava/UI/Helpers/LoggerAdapter.cs
@@ -0,0 +1,111 @@
+using Avalonia.Utilities;
+using System;
+using System.Text;
+
+namespace Ryujinx.Ava.UI.Helpers
+{
+ using AvaLogger = Avalonia.Logging.Logger;
+ using AvaLogLevel = Avalonia.Logging.LogEventLevel;
+ using RyuLogger = Ryujinx.Common.Logging.Logger;
+ using RyuLogClass = Ryujinx.Common.Logging.LogClass;
+
+ internal class LoggerAdapter : Avalonia.Logging.ILogSink
+ {
+ public static void Register()
+ {
+ AvaLogger.Sink = new LoggerAdapter();
+ }
+
+ private static RyuLogger.Log? GetLog(AvaLogLevel level)
+ {
+ return level switch
+ {
+ AvaLogLevel.Verbose => RyuLogger.Trace,
+ AvaLogLevel.Debug => RyuLogger.Debug,
+ AvaLogLevel.Information => RyuLogger.Info,
+ AvaLogLevel.Warning => RyuLogger.Warning,
+ AvaLogLevel.Error => RyuLogger.Error,
+ AvaLogLevel.Fatal => RyuLogger.Notice,
+ _ => throw new ArgumentOutOfRangeException(nameof(level), level, null)
+ };
+ }
+
+ public bool IsEnabled(AvaLogLevel level, string area)
+ {
+ return GetLog(level) != null;
+ }
+
+ public void Log(AvaLogLevel level, string area, object source, string messageTemplate)
+ {
+ GetLog(level)?.PrintMsg(RyuLogClass.Ui, Format(area, messageTemplate, source, null));
+ }
+
+ public void Log<T0>(AvaLogLevel level, string area, object source, string messageTemplate, T0 propertyValue0)
+ {
+ GetLog(level)?.PrintMsg(RyuLogClass.Ui, Format(area, messageTemplate, source, new object[] { propertyValue0 }));
+ }
+
+ public void Log<T0, T1>(AvaLogLevel level, string area, object source, string messageTemplate, T0 propertyValue0, T1 propertyValue1)
+ {
+ GetLog(level)?.PrintMsg(RyuLogClass.Ui, Format(area, messageTemplate, source, new object[] { propertyValue0, propertyValue1 }));
+ }
+
+ public void Log<T0, T1, T2>(AvaLogLevel level, string area, object source, string messageTemplate, T0 propertyValue0, T1 propertyValue1, T2 propertyValue2)
+ {
+ GetLog(level)?.PrintMsg(RyuLogClass.Ui, Format(area, messageTemplate, source, new object[] { propertyValue0, propertyValue1, propertyValue2 }));
+ }
+
+ public void Log(AvaLogLevel level, string area, object source, string messageTemplate, params object[] propertyValues)
+ {
+ GetLog(level)?.PrintMsg(RyuLogClass.Ui, Format(area, messageTemplate, source, propertyValues));
+ }
+
+ private static string Format(string area, string template, object source, object[] v)
+ {
+ var result = new StringBuilder();
+ var r = new CharacterReader(template.AsSpan());
+ var i = 0;
+
+ result.Append('[');
+ result.Append(area);
+ result.Append("] ");
+
+ while (!r.End)
+ {
+ var c = r.Take();
+
+ if (c != '{')
+ {
+ result.Append(c);
+ }
+ else
+ {
+ if (r.Peek != '{')
+ {
+ result.Append('\'');
+ result.Append(i < v.Length ? v[i++] : null);
+ result.Append('\'');
+ r.TakeUntil('}');
+ r.Take();
+ }
+ else
+ {
+ result.Append('{');
+ r.Take();
+ }
+ }
+ }
+
+ if (source != null)
+ {
+ result.Append(" (");
+ result.Append(source.GetType().Name);
+ result.Append(" #");
+ result.Append(source.GetHashCode());
+ result.Append(')');
+ }
+
+ return result.ToString();
+ }
+ }
+} \ No newline at end of file
diff --git a/Ryujinx.Ava/UI/Helpers/MetalHelper.cs b/Ryujinx.Ava/UI/Helpers/MetalHelper.cs
new file mode 100644
index 00000000..5eb8660a
--- /dev/null
+++ b/Ryujinx.Ava/UI/Helpers/MetalHelper.cs
@@ -0,0 +1,127 @@
+using System;
+using System.Runtime.Versioning;
+using System.Runtime.InteropServices;
+using Avalonia;
+
+namespace Ryujinx.Ava.UI.Helpers
+{
+ public delegate void UpdateBoundsCallbackDelegate(Rect rect);
+
+ [SupportedOSPlatform("macos")]
+ static partial class MetalHelper
+ {
+ private const string LibObjCImport = "/usr/lib/libobjc.A.dylib";
+
+ private struct Selector
+ {
+ public readonly IntPtr NativePtr;
+
+ public unsafe Selector(string value)
+ {
+ int size = System.Text.Encoding.UTF8.GetMaxByteCount(value.Length);
+ byte* data = stackalloc byte[size];
+
+ fixed (char* pValue = value)
+ {
+ System.Text.Encoding.UTF8.GetBytes(pValue, value.Length, data, size);
+ }
+
+ NativePtr = sel_registerName(data);
+ }
+
+ public static implicit operator Selector(string value) => new Selector(value);
+ }
+
+ private static unsafe IntPtr GetClass(string value)
+ {
+ int size = System.Text.Encoding.UTF8.GetMaxByteCount(value.Length);
+ byte* data = stackalloc byte[size];
+
+ fixed (char* pValue = value)
+ {
+ System.Text.Encoding.UTF8.GetBytes(pValue, value.Length, data, size);
+ }
+
+ return objc_getClass(data);
+ }
+
+ private struct NSPoint
+ {
+ public double X;
+ public double Y;
+
+ public NSPoint(double x, double y)
+ {
+ X = x;
+ Y = y;
+ }
+ }
+
+ private struct NSRect
+ {
+ public NSPoint Pos;
+ public NSPoint Size;
+
+ public NSRect(double x, double y, double width, double height)
+ {
+ Pos = new NSPoint(x, y);
+ Size = new NSPoint(width, height);
+ }
+ }
+
+ public static IntPtr GetMetalLayer(out IntPtr nsView, out UpdateBoundsCallbackDelegate updateBounds)
+ {
+ // Create a new CAMetalLayer.
+ IntPtr layerClass = GetClass("CAMetalLayer");
+ IntPtr metalLayer = IntPtr_objc_msgSend(layerClass, "alloc");
+ objc_msgSend(metalLayer, "init");
+
+ // Create a child NSView to render into.
+ IntPtr nsViewClass = GetClass("NSView");
+ IntPtr child = IntPtr_objc_msgSend(nsViewClass, "alloc");
+ objc_msgSend(child, "init", new NSRect(0, 0, 0, 0));
+
+ // Make its renderer our metal layer.
+ objc_msgSend(child, "setWantsLayer:", (byte)1);
+ objc_msgSend(child, "setLayer:", metalLayer);
+ objc_msgSend(metalLayer, "setContentsScale:", Program.DesktopScaleFactor);
+
+ // Ensure the scale factor is up to date.
+ updateBounds = (Rect rect) => {
+ objc_msgSend(metalLayer, "setContentsScale:", Program.DesktopScaleFactor);
+ };
+
+ nsView = child;
+ return metalLayer;
+ }
+
+ public static void DestroyMetalLayer(IntPtr nsView, IntPtr metalLayer)
+ {
+ // TODO
+ }
+
+ [LibraryImport(LibObjCImport)]
+ private static unsafe partial IntPtr sel_registerName(byte* data);
+
+ [LibraryImport(LibObjCImport)]
+ private static unsafe partial IntPtr objc_getClass(byte* data);
+
+ [LibraryImport(LibObjCImport)]
+ private static partial void objc_msgSend(IntPtr receiver, Selector selector);
+
+ [LibraryImport(LibObjCImport)]
+ private static partial void objc_msgSend(IntPtr receiver, Selector selector, byte value);
+
+ [LibraryImport(LibObjCImport)]
+ private static partial void objc_msgSend(IntPtr receiver, Selector selector, IntPtr value);
+
+ [LibraryImport(LibObjCImport)]
+ private static partial void objc_msgSend(IntPtr receiver, Selector selector, NSRect point);
+
+ [LibraryImport(LibObjCImport)]
+ private static partial void objc_msgSend(IntPtr receiver, Selector selector, double value);
+
+ [LibraryImport(LibObjCImport, EntryPoint = "objc_msgSend")]
+ private static partial IntPtr IntPtr_objc_msgSend(IntPtr receiver, Selector selector);
+ }
+} \ No newline at end of file
generated by cgit v1.2.3 (git 2.39.1) at 2026-06-11 20:20:46 +0000