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

Fix false-positive error when interop structure has a additional memory size (alignment)

Browse Source
This commit is contained in:
Wojtek Figat
2023-05-25 00:12:54 +02:00
parent c2cd3b64ff
commit ad1c573678
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Engine/Engine/NativeInterop.cs
View File

@@ -706,7 +706,7 @@ namespace FlaxEngine.Interop
MarshalHelper<T>.toManagedFieldMarshallers[i](MarshalHelper<T>.marshallableFields[i], ref managedValue, fieldPtr, out int fieldOffset); MarshalHelper<T>.toManagedFieldMarshallers[i](MarshalHelper<T>.marshallableFields[i], ref managedValue, fieldPtr, out int fieldOffset);
fieldPtr += fieldOffset; fieldPtr += fieldOffset;
} }
Assert.IsTrue((fieldPtr - nativePtr) == Unsafe.SizeOf<T>()); Assert.IsTrue((fieldPtr - nativePtr) <= Unsafe.SizeOf<T>());
} }
else else
managedValue = Unsafe.Read<T>(nativePtr.ToPointer()); managedValue = Unsafe.Read<T>(nativePtr.ToPointer());
@@ -745,7 +745,7 @@ namespace FlaxEngine.Interop
MarshalHelper<T>.toNativeFieldMarshallers[i](MarshalHelper<T>.marshallableFields[i], ref managedValue, nativePtr, out int fieldOffset); MarshalHelper<T>.toNativeFieldMarshallers[i](MarshalHelper<T>.marshallableFields[i], ref managedValue, nativePtr, out int fieldOffset);
nativePtr += fieldOffset; nativePtr += fieldOffset;
} }
Assert.IsTrue((nativePtr - fieldPtr) == Unsafe.SizeOf<T>()); Assert.IsTrue((nativePtr - fieldPtr) <= Unsafe.SizeOf<T>());
} }
else else
Unsafe.AsRef<T>(nativePtr.ToPointer()) = managedValue; Unsafe.AsRef<T>(nativePtr.ToPointer()) = managedValue;