GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Merge branch 'object_array_marshalling' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-object_array_marshalling

Browse Source
This commit is contained in:
Wojtek Figat
2023-05-10 09:22:22 +02:00
parent 32bab1e7bf 66de1e744a
commit c73897ce7f
9 changed files with 108 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Engine/Engine/NativeInterop.Invoker.cs
View File

@@ -18,6 +18,8 @@ namespace FlaxEngine.Interop
/// </summary>
internal static class Invoker
{
// TODO: Use .NET8 Unsafe.BitCast<TRet, ValueType>(returnValue) for more efficient casting of value types over boxing cast
internal static IntPtr MarshalReturnValue<TRet>(ref TRet returnValue)
{
if (returnValue == null)

2
Source/Engine/Engine/NativeInterop.Marshallers.cs
View File

@@ -141,7 +141,7 @@ namespace FlaxEngine.Interop
public static class ManagedToNative
{
public static IntPtr ConvertToUnmanaged(FlaxEngine.Object managed) => (object)managed != null ? ManagedHandle.ToIntPtr(managed) : IntPtr.Zero;
public static IntPtr ConvertToUnmanaged(FlaxEngine.Object managed) => Unsafe.As<object>(managed) != null ? ManagedHandle.ToIntPtr(managed) : IntPtr.Zero;
}
}

10
Source/Engine/Engine/NativeInterop.Unmanaged.cs
View File

@@ -770,12 +770,20 @@ namespace FlaxEngine.Interop
}
[UnmanagedCallersOnly]
internal static void SetArrayValueReference(ManagedHandle arrayHandle, IntPtr valueHandle, int index)
internal static void WriteArrayReference(ManagedHandle arrayHandle, IntPtr valueHandle, int index)
{
ManagedArray managedArray = Unsafe.As<ManagedArray>(arrayHandle.Target);
managedArray.ToSpan<IntPtr>()[index] = valueHandle;
}
[UnmanagedCallersOnly]
internal static void WriteArrayReferences(ManagedHandle arrayHandle, IntPtr spanPtr, int spanLength)
{
ManagedArray managedArray = Unsafe.As<ManagedArray>(arrayHandle.Target);
var unmanagedSpan = new Span<IntPtr>(spanPtr.ToPointer(), spanLength);
unmanagedSpan.CopyTo(managedArray.ToSpan<IntPtr>());
}
[UnmanagedCallersOnly]
internal static ManagedHandle LoadAssemblyImage(IntPtr assemblyPathPtr, IntPtr* assemblyName, IntPtr* assemblyFullName)
{