Add specification of discriminant values for the PinObjectMarshaller (#…

…1549) * Add specification of discriminant values for the PinObjectMarshaller * Helps if I remove the debug code
dotnet · Jul 1, 2023 · 0a8693e · 0a8693e
1 parent a4c1b84
commit 0a8693e
Show file tree

Hide file tree

Showing 3 changed files with 109 additions and 22 deletions.
diff --git a/src/Core/Silk.NET.Core/Native/PinObjectAttribute.cs b/src/Core/Silk.NET.Core/Native/PinObjectAttribute.cs
@@ -12,7 +12,15 @@ public PinObjectAttribute(PinMode mode = PinMode.Persist)
  {
  Mode = mode;
  }
+
+ // This is a separate constructor so we can always assume that the second argument is this discriminants.
+ public PinObjectAttribute(PinMode mode, string[] discriminants)
+ {
+ Mode = mode;
+ Discriminants = discriminants;
+ }
 
  public PinMode Mode { get; }
+ public string[] Discriminants { get; } = Array.Empty<string>();
  }
 }
diff --git a/src/Core/Silk.NET.SilkTouch/Middlewares/PinObjectMarshaller.cs b/src/Core/Silk.NET.SilkTouch/Middlewares/PinObjectMarshaller.cs
@@ -1,8 +1,10 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using System.Linq;
 using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
 using static Microsoft.CodeAnalysis.CSharp.SyntaxFactory;
 
 namespace Silk.NET.SilkTouch
@@ -18,10 +20,34 @@ public static void PinObjectMarshaller(ref IMarshalContext ctx, Action next)
 
  var gcSlot = ctx.AllocateGcSlot();
  PinMode pinMode;
- if (data.ConstructorArguments.Length < 1)
+ string[] discriminantExprs;
+ if (data is null || data.ConstructorArguments.Length < 1)
+ {
  pinMode = PinMode.Persist;
+ }
  else
+ {
  pinMode = (PinMode) (data.ConstructorArguments[0].Value ?? PinMode.Persist);
+ }
+
+ if (data is null ||
+ data.ConstructorArguments.Length < 2 ||
+ data.ConstructorArguments[1].Values.Length == 0)
+ {
+ discriminantExprs = Array.Empty<string>();
+ }
+ else
+ {
+ discriminantExprs = data.ConstructorArguments[1]
+ .Values
+ .Select(x => x.Value as string)
+ .Where(x => x is not null)
+ .ToArray()!;
+ }
+
+ var slotSyntax = discriminantExprs.Length == 0
+ ? LiteralExpression(SyntaxKind.NumericLiteralExpression, Literal(gcSlot))
+ : MixDiscriminants(gcSlot, discriminantExprs);
 
  var name = pinMode switch
  {
@@ -46,8 +72,7 @@ public static void PinObjectMarshaller(ref IMarshalContext ctx, Action next)
  new[]
  {
  Argument(parameterVariable.Value),
- Argument
- (LiteralExpression(SyntaxKind.NumericLiteralExpression, Literal(gcSlot)))
+ Argument(slotSyntax)
  }
  )
  )
@@ -64,10 +89,32 @@ public static void PinObjectMarshaller(ref IMarshalContext ctx, Action next)
  var gcSlot = ctx.AllocateGcSlot();
 
  PinMode pinMode;
+ string[] discriminantExprs;
  if (resultData.ConstructorArguments.Length < 1)
+ {
  pinMode = PinMode.Persist;
+ }
  else
+ {
  pinMode = (PinMode) (resultData.ConstructorArguments[0].Value ?? PinMode.Persist);
+ }
+
+ if (resultData.ConstructorArguments.Length < 2 || resultData.ConstructorArguments[1].Values.Length == 0)
+ {
+ discriminantExprs = Array.Empty<string>();
+ }
+ else
+ {
+ discriminantExprs = resultData.ConstructorArguments[1]
+ .Values
+ .Select(x => x.Value as string)
+ .Where(x => x is not null)
+ .ToArray()!;
+ }
+
+ var slotSyntax = discriminantExprs.Length == 0
+ ? LiteralExpression(SyntaxKind.NumericLiteralExpression, Literal(gcSlot))
+ : MixDiscriminants(gcSlot, discriminantExprs);
 
  var name = pinMode switch
  {
@@ -92,15 +139,47 @@ public static void PinObjectMarshaller(ref IMarshalContext ctx, Action next)
  new[]
  {
  Argument(resultVariable.Value),
- Argument
- (LiteralExpression(SyntaxKind.NumericLiteralExpression, Literal(gcSlot)))
+ Argument(slotSyntax)
  }
  )
  )
  )
  )
  );
  }
+
+ static ExpressionSyntax MixDiscriminants(int slot, string[] discriminants) => InvocationExpression
+ (
+ MemberAccessExpression
+ (
+ SyntaxKind.SimpleMemberAccessExpression,
+ MemberAccessExpression
+ (
+ SyntaxKind.SimpleMemberAccessExpression,
+ AliasQualifiedName
+ (
+ IdentifierName
+ (
+ Token(SyntaxKind.GlobalKeyword)
+ ),
+ IdentifierName("System")
+ ),
+ IdentifierName("HashCode")
+ ),
+ IdentifierName("Combine")
+ ),
+ ArgumentList
+ (
+ SeparatedList
+ (
+ Enumerable.Repeat
+ (
+ Argument(LiteralExpression(SyntaxKind.NumericLiteralExpression, Literal(slot))),
+ 1
+ ).Concat(discriminants.Select(x => Argument(ParseExpression(x))))
+ )
+ )
+ );
  }
  }
 

diff --git a/src/Windowing/Silk.NET.GLFW/Glfw.cs b/src/Windowing/Silk.NET.GLFW/Glfw.cs
@@ -2631,7 +2631,7 @@ public unsafe partial WindowHandle* CreateWindow
  public unsafe partial GlfwCallbacks.CharCallback SetCharCallback
  (
  WindowHandle* window,
- [PinObject(PinMode.UntilNextCall)] GlfwCallbacks.CharCallback callback
+ [PinObject(PinMode.UntilNextCall, new []{"(nint)window"})] GlfwCallbacks.CharCallback callback
  );
 
  /// <summary>
@@ -2667,7 +2667,7 @@ public unsafe partial GlfwCallbacks.CharCallback SetCharCallback
  public unsafe partial GlfwCallbacks.CharModsCallback SetCharModsCallback
  (
  WindowHandle* window,
- [PinObject(PinMode.UntilNextCall)] GlfwCallbacks.CharModsCallback callback
+ [PinObject(PinMode.UntilNextCall, new []{"(nint)window"})] GlfwCallbacks.CharModsCallback callback
  );
 
  /// <summary>
@@ -2692,7 +2692,7 @@ public unsafe partial GlfwCallbacks.CharModsCallback SetCharModsCallback
  public unsafe partial GlfwCallbacks.CursorEnterCallback SetCursorEnterCallback
  (
  WindowHandle* window,
- [PinObject(PinMode.UntilNextCall)] GlfwCallbacks.CursorEnterCallback callback
+ [PinObject(PinMode.UntilNextCall, new []{"(nint)window"})] GlfwCallbacks.CursorEnterCallback callback
  );
 
  /// <summary>
@@ -2721,7 +2721,7 @@ public unsafe partial GlfwCallbacks.CursorEnterCallback SetCursorEnterCallback
  public unsafe partial GlfwCallbacks.CursorPosCallback SetCursorPosCallback
  (
  WindowHandle* window,
- [PinObject(PinMode.UntilNextCall)] GlfwCallbacks.CursorPosCallback callback
+ [PinObject(PinMode.UntilNextCall, new []{"(nint)window"})] GlfwCallbacks.CursorPosCallback callback
  );
 
  /// <summary>
@@ -2751,7 +2751,7 @@ public unsafe partial GlfwCallbacks.CursorPosCallback SetCursorPosCallback
  public unsafe partial GlfwCallbacks.DropCallback SetDropCallback
  (
  WindowHandle* window,
- [PinObject(PinMode.UntilNextCall)] GlfwCallbacks.DropCallback callback
+ [PinObject(PinMode.UntilNextCall, new []{"(nint)window"})] GlfwCallbacks.DropCallback callback
  );
 
  /// <summary>
@@ -2947,7 +2947,7 @@ public partial GlfwCallbacks.JoystickCallback SetJoystickCallback
  public unsafe partial GlfwCallbacks.KeyCallback SetKeyCallback
  (
  WindowHandle* window,
- [PinObject(PinMode.UntilNextCall)] GlfwCallbacks.KeyCallback callback
+ [PinObject(PinMode.UntilNextCall, new []{"(nint)window"})] GlfwCallbacks.KeyCallback callback
  );
 
  /// <summary>
@@ -2975,7 +2975,7 @@ public unsafe partial GlfwCallbacks.KeyCallback SetKeyCallback
  public unsafe partial GlfwCallbacks.ScrollCallback SetScrollCallback
  (
  WindowHandle* window,
- [PinObject(PinMode.UntilNextCall)] GlfwCallbacks.ScrollCallback callback
+ [PinObject(PinMode.UntilNextCall, new []{"(nint)window"})] GlfwCallbacks.ScrollCallback callback
  );
 
  /// <summary>
@@ -3028,7 +3028,7 @@ public partial GlfwCallbacks.MonitorCallback SetMonitorCallback
  public unsafe partial GlfwCallbacks.MouseButtonCallback SetMouseButtonCallback
  (
  WindowHandle* window,
- [PinObject(PinMode.UntilNextCall)] GlfwCallbacks.MouseButtonCallback callback
+ [PinObject(PinMode.UntilNextCall, new []{"(nint)window"})] GlfwCallbacks.MouseButtonCallback callback
  );
 
  /// <summary>
@@ -3064,7 +3064,7 @@ public unsafe partial GlfwCallbacks.MouseButtonCallback SetMouseButtonCallback
  public unsafe partial GlfwCallbacks.WindowCloseCallback SetWindowCloseCallback
  (
  WindowHandle* window,
- [PinObject(PinMode.UntilNextCall)] GlfwCallbacks.WindowCloseCallback callback
+ [PinObject(PinMode.UntilNextCall, new []{"(nint)window"})] GlfwCallbacks.WindowCloseCallback callback
  );
 
  /// <summary>
@@ -3094,7 +3094,7 @@ public unsafe partial GlfwCallbacks.WindowCloseCallback SetWindowCloseCallback
  public unsafe partial GlfwCallbacks.WindowFocusCallback SetWindowFocusCallback
  (
  WindowHandle* window,
- [PinObject(PinMode.UntilNextCall)] GlfwCallbacks.WindowFocusCallback callback
+ [PinObject(PinMode.UntilNextCall, new []{"(nint)window"})] GlfwCallbacks.WindowFocusCallback callback
  );
 
  /// <summary>
@@ -3152,7 +3152,7 @@ public unsafe partial GlfwCallbacks.WindowFocusCallback SetWindowFocusCallback
  public unsafe partial GlfwCallbacks.WindowIconifyCallback SetWindowIconifyCallback
  (
  WindowHandle* window,
- [PinObject(PinMode.UntilNextCall)] GlfwCallbacks.WindowIconifyCallback callback
+ [PinObject(PinMode.UntilNextCall, new []{"(nint)window"})] GlfwCallbacks.WindowIconifyCallback callback
  );
 
  /// <summary>
@@ -3177,7 +3177,7 @@ public unsafe partial GlfwCallbacks.WindowIconifyCallback SetWindowIconifyCallba
  public unsafe partial GlfwCallbacks.WindowMaximizeCallback SetWindowMaximizeCallback
  (
  WindowHandle* window,
- [PinObject(PinMode.UntilNextCall)] GlfwCallbacks.WindowMaximizeCallback callback
+ [PinObject(PinMode.UntilNextCall, new []{"(nint)window"})] GlfwCallbacks.WindowMaximizeCallback callback
  );
 
  /// <summary>
@@ -3277,7 +3277,7 @@ public unsafe partial GlfwCallbacks.WindowMaximizeCallback SetWindowMaximizeCall
  public unsafe partial GlfwCallbacks.WindowSizeCallback SetWindowSizeCallback
  (
  WindowHandle* window,
- [PinObject(PinMode.UntilNextCall)] GlfwCallbacks.WindowSizeCallback callback
+ [PinObject(PinMode.UntilNextCall, new []{"(nint)window"})] GlfwCallbacks.WindowSizeCallback callback
  );
 
  /// <summary>
@@ -3301,7 +3301,7 @@ public unsafe partial GlfwCallbacks.WindowSizeCallback SetWindowSizeCallback
  public unsafe partial GlfwCallbacks.FramebufferSizeCallback SetFramebufferSizeCallback
  (
  WindowHandle* window,
- [PinObject(PinMode.UntilNextCall)] GlfwCallbacks.FramebufferSizeCallback callback
+ [PinObject(PinMode.UntilNextCall, new []{"(nint)window"})] GlfwCallbacks.FramebufferSizeCallback callback
  );
 
  /// <summary>
@@ -3433,7 +3433,7 @@ int refreshRate
  public unsafe partial GlfwCallbacks.WindowPosCallback SetWindowPosCallback
  (
  WindowHandle* window,
- [PinObject(PinMode.UntilNextCall)] GlfwCallbacks.WindowPosCallback callback
+ [PinObject(PinMode.UntilNextCall, new []{"(nint)window"})] GlfwCallbacks.WindowPosCallback callback
  );
 
  /// <summary>
@@ -3467,7 +3467,7 @@ public unsafe partial GlfwCallbacks.WindowPosCallback SetWindowPosCallback
  public unsafe partial GlfwCallbacks.WindowRefreshCallback SetWindowRefreshCallback
  (
  WindowHandle* window,
- [PinObject(PinMode.UntilNextCall)] GlfwCallbacks.WindowRefreshCallback callback
+ [PinObject(PinMode.UntilNextCall, new []{"(nint)window"})] GlfwCallbacks.WindowRefreshCallback callback
  );
 
  /// <summary>