Fix struct layout issues in DirectX and OpenXR bindings (#522)

* Fix DirectX (and some OpenXR) bindings & regenerate

* Revert OpenXR regen

* Fix #523 and review comments

* Fix missing OpenXR mappings

Author: Perksey

build/cache/d3d12.json.gz

@@ -83,6 +83,7 @@
     "uint32_t": "uint",
     "uint64_t": "ulong",
     "size_t": "nuint",
+    "wchar_t": "char",
     "ANativeWindow": "nint",
     "MirConnection": "nint",
     "MirSurface": "nint",
@@ -132,7 +133,7 @@
     "wl_resource": "nint",
     "wl_buffer": "nint",
     "jobject": "nint",
-    "timespec": "ValueTuple<nint,nint>",
+    "timespec": "Timespec",
     "LARGE_INTEGER": "long",
     "xcb_glx_fbconfig_t": "nint",
     "xcb_glx_drawable_t": "nint",
@@ -143,7 +144,7 @@
     "HMONITOR__*": "nint",
     "HDC__**": "nint*",
     "HMONITOR__**": "nint*",
-    "_LUID": "ValueTuple<ulong, long>",
+    "_LUID": "Luid",
     "_LARGE_INTEGER": "long",
     "IUnknown": "Silk.NET.Core.Native.IUnknown",
     "tagRECT": "Silk.NET.Maths.Rectangle<int>",

build/cache/dxgi.json.gz

@@ -611,6 +611,10 @@
                 "iOS": "__Internal",
                 "className": "OpenXRLibraryNameContainer"
             },
+            "exclude": [
+                "XrUuidMSFT",
+                "XrSceneSphereBoundMSFT"
+            ],
             "typeMaps": [
                 {
                     "char": "byte",
@@ -644,7 +648,13 @@
                     "EGLContext": "nint",
                     "GLXFBConfig": "nint",
                     "VkFormat": "uint",
-                    "EGLenum":  "uint"
+                    "EGLenum":  "uint",
+                    "XrUuidMSFT": "Guid",
+                    "XrSceneSphereBoundMSFT": "Silk.NET.Maths.Sphere<float>",
+                    "VkSamplerMipmapMode": "uint",
+                    "VkComponentSwizzle": "uint",
+                    "VkSamplerAddressMode": "uint",
+                    "VkFilter": "uint"
                 },
                 {
                     "$include.commonTypeMap": "build/csharp_typemap.json"

build/cache/openxr.json.gz

@@ -1,4 +1,5 @@
-using System.Xml.Linq;
+using System.Xml;
+using System.Xml.Linq;
 
 namespace Silk.NET.BuildTools.Converters.Khronos
 {
@@ -106,11 +107,26 @@ public static ParameterDefinition CreateFromXml(XElement xe)
             {
                 var val = xe.Value;
                 var idx = val.LastIndexOf('[') + 1;
-                if (idx != -1 && int.TryParse(val.Substring(idx, val.Length - idx - 1), out count))
+                if (idx != -1)
                 {
                     // array parameters are pointers in disguise
                     pointerLevel++;
                 }
+
+                var countVal = val.Substring(idx, val.Length - idx - 1);
+                if (!int.TryParse(countVal, out count))
+                {
+                    try
+                    {
+                        countVal = XElement.Parse(countVal).Value;
+                    }
+                    catch (XmlException)
+                    {
+                        // do nothing
+                    }
+
+                    symbolic = countVal;
+                }
             }
 
             var type = new TypeSpec(typeName, pointerLevel);

build/csharp_typemap.json

@@ -0,0 +1,11 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Silk.NET.Core.Native
+{
+    public struct Luid
+    {
+        public uint Low;
+        public int High;
+    }
+}

generator.json

@@ -0,0 +1,11 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Silk.NET.Core.Native
+{
+    public struct Timespec
+    {
+        public nint Seconds;
+        public nint Nanoseconds;
+    }
+}

src/Core/Silk.NET.BuildTools/Converters/Khronos/ParameterDefinition.cs

@@ -28,7 +28,7 @@ public AdapterDesc
             nuint? dedicatedVideoMemory = null,
             nuint? dedicatedSystemMemory = null,
             nuint? sharedSystemMemory = null,
-            ValueTuple<ulong,long>? adapterLuid = null
+            Luid? adapterLuid = null
         ) : this()
         {
             if (vendorId is not null)
@@ -115,6 +115,6 @@ public AdapterDesc
         [NativeName("Type", "LUID")]
         [NativeName("Type.Name", "LUID")]
         [NativeName("Name", "AdapterLuid")]
-        public ValueTuple<ulong,long> AdapterLuid;
+        public Luid AdapterLuid;
     }
 }

src/Core/Silk.NET.Core/Native/Structs/Luid.cs

@@ -28,7 +28,7 @@ public AdapterDesc1
             nuint? dedicatedVideoMemory = null,
             nuint? dedicatedSystemMemory = null,
             nuint? sharedSystemMemory = null,
-            ValueTuple<ulong,long>? adapterLuid = null,
+            Luid? adapterLuid = null,
             uint? flags = null
         ) : this()
         {
@@ -121,7 +121,7 @@ public AdapterDesc1
         [NativeName("Type", "LUID")]
         [NativeName("Type.Name", "LUID")]
         [NativeName("Name", "AdapterLuid")]
-        public ValueTuple<ulong,long> AdapterLuid;
+        public Luid AdapterLuid;
 
         [NativeName("Type", "UINT")]
         [NativeName("Type.Name", "UINT")]