Replace custom library load with net8 NativeLibrary (#4)

* replace custom library load with net8 NativeLibrary

* Minor typo fix.

---------

Co-authored-by: jcant0n <javiercantonferrero@gmail.com>

OpenXRGen/Evergine.Bindings.OpenXR/Commands.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Runtime.InteropServices;
-using static Evergine.Bindings.OpenXR.OperatingSystemHelper;
 
 namespace Evergine.Bindings.OpenXR
 {
@@ -15,7 +14,7 @@ public static unsafe partial class OpenXRNative
         static OpenXRNative()
         {
             nativeLib = LoadNativeLibrary();
-            LoadFuncionPointers();
+            LoadFunctionPointers();
         }
 
         private static NativeLibrary LoadNativeLibrary()
@@ -25,16 +24,16 @@ private static NativeLibrary LoadNativeLibrary()
 
         private static string GetOpenXRName()
         {
-            if (IsOSPlatform(PlatformType.Windows))
+            if (OperatingSystem.IsWindows())
             {
                 return "openxr_loader.dll";
             }
-            else if (IsOSPlatform(PlatformType.Android))
+            else if (OperatingSystem.IsAndroid())
             {
                 // Android
                 return "libopenxr_loader.so";
             }
-            else if (IsOSPlatform(PlatformType.Linux))
+            else if (OperatingSystem.IsLinux())
             {
                 // Desktop Linux
                 return "libopenxr_loader.so.1";

OpenXRGen/Evergine.Bindings.OpenXR/Evergine.Bindings.OpenXR.csproj

@@ -2,6 +2,10 @@
 
 	<PropertyGroup>
 		<TargetFramework>net8.0</TargetFramework>
+		<Copyright>Copyright (c) Evergine 2024</Copyright>
+		<Authors>Evergine Team</Authors>
+		<Company>Plain Concepts</Company>
+		<Description>Low-level bindings for OpenXR used in Evergine</Description>
 		<RepositoryUrl>https://github.com/EvergineTeam/OpenXR.NET</RepositoryUrl>
 		<PackageIcon>icon.png</PackageIcon>
 		<PackageReadmeFile>README.md</PackageReadmeFile>
@@ -16,10 +20,8 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<None Include="..\..\icon.png" Pack="true" PackagePath="\"/>
-	</ItemGroup>
-	<ItemGroup>
-		<None Include="..\..\README.md" Pack="true" PackagePath="\"/>
+		<None Include="..\..\icon.png" Pack="true" PackagePath="\" Visible="false" />
+		<None Include="..\..\README.md" Pack="true" PackagePath="\" Visible="false" />
 	</ItemGroup>
 
 </Project>

OpenXRGen/Evergine.Bindings.OpenXR/Generated/Commands.cs

@@ -1715,7 +1715,7 @@ public static XrResult xrPollFutureEXT(XrInstance instance, XrFuturePollInfoEXT*
 		public static XrResult xrCancelFutureEXT(XrInstance instance, XrFutureCancelInfoEXT* cancelInfo)
 			=> xrCancelFutureEXT_ptr(instance, cancelInfo);
 
-		public static void LoadFuncionPointers(XrInstance instance = default)
+		public static void LoadFunctionPointers(XrInstance instance = default)
 		{
 			if (instance != default)
 			{

OpenXRGen/Evergine.Bindings.OpenXR/NativeLibrary.cs

@@ -1,19 +1,19 @@
 using System;
 using System.Diagnostics;
-using System.IO;
 using System.Runtime.InteropServices;
+using SysNativeLibrary = System.Runtime.InteropServices.NativeLibrary;
 
 namespace Evergine.Bindings.OpenXR
 {
-    public abstract class NativeLibrary : IDisposable
+    public class NativeLibrary : IDisposable
     {
         private readonly string libraryName;
         private readonly IntPtr libraryHandle;
         internal XrInstance instance;
 
         public IntPtr NativeHandle => libraryHandle;
 
-        public NativeLibrary(string libraryName)
+        protected NativeLibrary(string libraryName)
         {
             this.libraryName = libraryName;
             libraryHandle = LoadLibrary(this.libraryName);
@@ -23,13 +23,28 @@ public NativeLibrary(string libraryName)
             }
         }
 
-        protected abstract IntPtr LoadLibrary(string libraryName);
-        protected abstract void FreeLibrary(IntPtr libraryHandle);
-        protected abstract IntPtr LoadFunction(string functionName);
+        protected IntPtr LoadLibrary(string libraryName)
+        {
+            if (SysNativeLibrary.TryLoad(libraryName, typeof(NativeLibrary).Assembly, null, out var lib))
+            {
+                return lib;
+            }
+
+            Debug.WriteLine($" ===> Error loading native library {libraryName}");
+            return IntPtr.Zero;
+        }
+
+        protected void FreeLibrary(IntPtr libraryHandle)
+        {
+            if (libraryHandle != IntPtr.Zero)
+            {
+                SysNativeLibrary.Free(libraryHandle);
+            }
+        }
 
         public unsafe void LoadFunction<T>(string name, out T field)
         {
-            IntPtr funcPtr = LoadFunction(name);
+            SysNativeLibrary.TryGetExport(libraryHandle, name, out IntPtr funcPtr);
             if (funcPtr == IntPtr.Zero)
             {
                 OpenXRNative.xrGetInstanceProcAddr(instance, (byte*)Marshal.StringToHGlobalAnsi(name), new IntPtr(&funcPtr));
@@ -53,77 +68,7 @@ public void Dispose()
 
         public static NativeLibrary Load(string libraryName)
         {
-            if (OperatingSystemHelper.IsOSPlatform(OperatingSystemHelper.PlatformType.Windows))
-            {
-                return new WindowsNativeLibrary(libraryName);
-            }
-            else if (OperatingSystemHelper.IsOSPlatform(OperatingSystemHelper.PlatformType.Android)
-                || OperatingSystemHelper.IsOSPlatform(OperatingSystemHelper.PlatformType.Linux)
-                || OperatingSystemHelper.IsOSPlatform(OperatingSystemHelper.PlatformType.MacOS))
-            {
-                return new UnixNativeLibrary(libraryName);
-            }
-            else
-            {
-                throw new PlatformNotSupportedException("Cannot load native libraries on this platform: " + RuntimeInformation.OSDescription);
-            }
-        }
-
-        private class WindowsNativeLibrary : NativeLibrary
-        {
-            public WindowsNativeLibrary(string libraryName) : base(libraryName)
-            {
-            }
-
-            protected override IntPtr LoadLibrary(string libraryName)
-            {
-                return Kernel32.LoadLibrary(libraryName);
-            }
-
-            protected override void FreeLibrary(IntPtr libraryHandle)
-            {
-                Kernel32.FreeLibrary(libraryHandle);
-            }
-
-            protected override IntPtr LoadFunction(string functionName)
-            {
-                Debug.WriteLine("Loading " + functionName);
-                return Kernel32.GetProcAddress(NativeHandle, functionName);
-            }
-        }
-
-        private class UnixNativeLibrary : NativeLibrary
-        {
-            public UnixNativeLibrary(string libraryName) : base(libraryName)
-            {
-            }
-
-            protected override IntPtr LoadLibrary(string libraryName)
-            {
-                Libdl.dlerror();
-                IntPtr handle = Libdl.dlopen(libraryName, Libdl.RTLD_NOW);
-                if (handle == IntPtr.Zero && !Path.IsPathRooted(libraryName))
-                {
-                    string baseDir = AppContext.BaseDirectory;
-                    if (!string.IsNullOrWhiteSpace(baseDir))
-                    {
-                        string localPath = Path.Combine(baseDir, libraryName);
-                        handle = Libdl.dlopen(localPath, Libdl.RTLD_NOW);
-                    }
-                }
-
-                return handle;
-            }
-
-            protected override void FreeLibrary(IntPtr libraryHandle)
-            {
-                Libdl.dlclose(libraryHandle);
-            }
-
-            protected override IntPtr LoadFunction(string functionName)
-            {
-                return Libdl.dlsym(NativeHandle, functionName);
-            }
+            return new NativeLibrary(libraryName);
         }
     }
 }

OpenXRGen/OpenXRGen/Program.cs

@@ -261,7 +261,7 @@ static void Main(string[] args)
                     file.WriteLine($"\t\t\t=> {command.Prototype.Name}_ptr({command.GetParametersSignature(openXRSpec, useTypes: false)});\n");
                 }
 
-                file.WriteLine($"\t\tpublic static void LoadFuncionPointers(XrInstance instance = default)");
+                file.WriteLine($"\t\tpublic static void LoadFunctionPointers(XrInstance instance = default)");
                 file.WriteLine("\t\t{");
                 file.WriteLine("\t\t\tif (instance != default)");
                 file.WriteLine("\t\t\t{");