Skip to content

Commit

Permalink
Remove ADL from GLFW. Use DllImport.
Browse files Browse the repository at this point in the history
  • Loading branch information
PJB3005 committed Oct 4, 2019
1 parent 3988936 commit 5361d02
Show file tree
Hide file tree
Showing 17 changed files with 4,505 additions and 4,009 deletions.
2 changes: 1 addition & 1 deletion src/OpenToolkit.Core/OpenToolkit.Core.csproj
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<RootNamespace>OpenToolkit.Core</RootNamespace>
</PropertyGroup>
Expand Down
73 changes: 73 additions & 0 deletions src/OpenToolkit.Core/Utility/MarshalUtility.cs
@@ -0,0 +1,73 @@
using System;
using System.Runtime.InteropServices;

namespace OpenToolkit.Core
{
internal static class MarshalUtility
{
public static unsafe IntPtr StringToCoTaskMemUTF8(string str)
{
#if NETSTANDARD2_0
if (str == null)
{
return IntPtr.Zero;
}

var maxByteLength = System.Text.Encoding.UTF8.GetMaxByteCount(str.Length);

var ptr = (byte*)Marshal.AllocCoTaskMem(maxByteLength + 1);

int actualLen;
fixed (char* pChar = str)
{
actualLen = System.Text.Encoding.UTF8.GetBytes(pChar, str.Length, ptr, maxByteLength);
}
ptr[actualLen] = 0;

return (IntPtr)ptr;
#else
return Marshal.StringToCoTaskMemUTF8(str);
#endif
}

/// <summary>
/// Converts a null-terminated UTF-8 string to a <see cref="string" />.
/// </summary>
/// <param name="ptr">The pointer to the null-terminated UTF-8 data.</param>
/// <returns>The string.</returns>
public static unsafe string PtrToStringUTF8(byte* ptr)
{
#if NETSTANDARD2_0

if (ptr == null)
{
return null;
}

var length = FindNullTerminator(ptr);

return System.Text.Encoding.UTF8.GetString(ptr, length);
#else
return Marshal.PtrToStringUTF8((IntPtr)ptr);
#endif
}

#if NETSTANDARD2_0
private static unsafe int FindNullTerminator(byte* ptr)
{
if (ptr == null)
{
throw new ArgumentNullException(nameof(ptr));
}

var i = 0;
while (ptr[i] != 0)
{
i++;
}

return i;
}
#endif
}
}
2 changes: 2 additions & 0 deletions src/OpenToolkit.Mathematics/Matrix/Matrix4.cs
Expand Up @@ -23,6 +23,7 @@
using System;
using System.Diagnostics.CodeAnalysis;
using System.Diagnostics.Contracts;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;

namespace OpenToolkit.Mathematics
Expand Down Expand Up @@ -1379,6 +1380,7 @@ public static Matrix4 Mult(Matrix4 left, Matrix4 right)
/// <param name="left">The left operand of the multiplication.</param>
/// <param name="right">The right operand of the multiplication.</param>
/// <param name="result">A new instance that is the result of the multiplication.</param>
[MethodImpl((MethodImplOptions)512 | MethodImplOptions.NoInlining)]
public static void Mult(ref Matrix4 left, ref Matrix4 right, out Matrix4 result)
{
float leftM11 = left.Row0.X;
Expand Down

0 comments on commit 5361d02

Please sign in to comment.