Skip to content

Fix DirectX (and some OpenXR) bindings & regenerate #522

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jun 13, 2021
Merged

Fix DirectX (and some OpenXR) bindings & regenerate #522

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
71c294c
Fix DirectX (and some OpenXR) bindings & regenerate
Perksey Jun 11, 2021
c0863ad
Revert OpenXR regen
Perksey Jun 12, 2021
c89f036
Fix #523 and review comments
Perksey Jun 12, 2021
d353095
Fix missing OpenXR mappings
Perksey Jun 13, 2021
1ffacce
Fix build errors
Perksey Jun 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified build/cache/d3d12.json.gz
View file
Open in desktop
Binary file not shown.
Binary file modified build/cache/dxgi.json.gz
View file
Open in desktop
Binary file not shown.
Binary file modified build/cache/openxr.json.gz
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions build/csharp_typemap.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,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",
Expand All @@ -143,7 +143,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>",
Expand Down
19 changes: 19 additions & 0 deletions src/Core/Silk.NET.Core/Native/Structs/Luid.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
// 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;

// TODO REMOVE THESE IN 3.0! THESE ARE FOR COMPATIBILITY TO SOFTEN THE BLOW OF THE BREAKING CHANGE IN 2.6!
public static implicit operator (ulong, long)(Luid instance) => (instance.Low, instance.High);

public static implicit operator Luid((ulong, long) instance)
=> new() {Low = (uint) instance.Item1, High = (int) instance.Item2};

public void Deconstruct(out ulong low, out long high) => (low, high) = (Low, High);
}
}
11 changes: 11 additions & 0 deletions src/Core/Silk.NET.Core/Native/Structs/Timespec.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
}
}
4 changes: 2 additions & 2 deletions src/Microsoft/Silk.NET.DXGI/Structs/AdapterDesc.gen.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -115,6 +115,6 @@ public AdapterDesc
[NativeName("Type", "LUID")]
[NativeName("Type.Name", "LUID")]
[NativeName("Name", "AdapterLuid")]
public ValueTuple<ulong,long> AdapterLuid;
public Luid AdapterLuid;
}
}
4 changes: 2 additions & 2 deletions src/Microsoft/Silk.NET.DXGI/Structs/AdapterDesc1.gen.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
{
Expand Down Expand Up @@ -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")]
Expand Down
4 changes: 2 additions & 2 deletions src/Microsoft/Silk.NET.DXGI/Structs/AdapterDesc2.gen.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public AdapterDesc2
nuint? dedicatedVideoMemory = null,
nuint? dedicatedSystemMemory = null,
nuint? sharedSystemMemory = null,
ValueTuple<ulong,long>? adapterLuid = null,
Luid? adapterLuid = null,
uint? flags = null,
GraphicsPreemptionGranularity? graphicsPreemptionGranularity = null,
ComputePreemptionGranularity? computePreemptionGranularity = null
Expand Down Expand Up @@ -133,7 +133,7 @@ public AdapterDesc2
[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")]
Expand Down
4 changes: 2 additions & 2 deletions src/Microsoft/Silk.NET.DXGI/Structs/AdapterDesc3.gen.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public AdapterDesc3
nuint? dedicatedVideoMemory = null,
nuint? dedicatedSystemMemory = null,
nuint? sharedSystemMemory = null,
ValueTuple<ulong,long>? adapterLuid = null,
Luid? adapterLuid = null,
AdapterFlag3? flags = null,
GraphicsPreemptionGranularity? graphicsPreemptionGranularity = null,
ComputePreemptionGranularity? computePreemptionGranularity = null
Expand Down Expand Up @@ -133,7 +133,7 @@ public AdapterDesc3
[NativeName("Type", "LUID")]
[NativeName("Type.Name", "LUID")]
[NativeName("Name", "AdapterLuid")]
public ValueTuple<ulong,long> AdapterLuid;
public Luid AdapterLuid;

[NativeName("Type", "DXGI_ADAPTER_FLAG3")]
[NativeName("Type.Name", "DXGI_ADAPTER_FLAG3")]
Expand Down
20 changes: 10 additions & 10 deletions src/Microsoft/Silk.NET.DXGI/Structs/IDXGIFactory2.gen.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1644,48 +1644,48 @@ public readonly unsafe int CreateSwapChainForCoreWindow(ref Silk.NET.Core.Native
}

/// <summary>To be documented.</summary>
public readonly unsafe int GetSharedResourceAdapterLuid(void* hResource, ValueTuple<ulong, long>* pLuid)
public readonly unsafe int GetSharedResourceAdapterLuid(void* hResource, Luid* pLuid)
{
var @this = (IDXGIFactory2*) Unsafe.AsPointer(ref Unsafe.AsRef(in this));
int ret = default;
ret = ((delegate* unmanaged[Cdecl]<IDXGIFactory2*, void*, ValueTuple<ulong, long>*, int>)LpVtbl[17])(@this, hResource, pLuid);
ret = ((delegate* unmanaged[Cdecl]<IDXGIFactory2*, void*, Luid*, int>)LpVtbl[17])(@this, hResource, pLuid);
return ret;
}

/// <summary>To be documented.</summary>
public readonly unsafe int GetSharedResourceAdapterLuid(void* hResource, ref ValueTuple<ulong, long> pLuid)
public readonly unsafe int GetSharedResourceAdapterLuid(void* hResource, ref Luid pLuid)
{
var @this = (IDXGIFactory2*) Unsafe.AsPointer(ref Unsafe.AsRef(in this));
int ret = default;
fixed (ValueTuple<ulong, long>* pLuidPtr = &pLuid)
fixed (Luid* pLuidPtr = &pLuid)
{
ret = ((delegate* unmanaged[Cdecl]<IDXGIFactory2*, void*, ValueTuple<ulong, long>*, int>)LpVtbl[17])(@this, hResource, pLuidPtr);
ret = ((delegate* unmanaged[Cdecl]<IDXGIFactory2*, void*, Luid*, int>)LpVtbl[17])(@this, hResource, pLuidPtr);
}
return ret;
}

/// <summary>To be documented.</summary>
public readonly unsafe int GetSharedResourceAdapterLuid<T0>(ref T0 hResource, ValueTuple<ulong, long>* pLuid) where T0 : unmanaged
public readonly unsafe int GetSharedResourceAdapterLuid<T0>(ref T0 hResource, Luid* pLuid) where T0 : unmanaged
{
var @this = (IDXGIFactory2*) Unsafe.AsPointer(ref Unsafe.AsRef(in this));
int ret = default;
fixed (T0* hResourcePtr = &hResource)
{
ret = ((delegate* unmanaged[Cdecl]<IDXGIFactory2*, T0*, ValueTuple<ulong, long>*, int>)LpVtbl[17])(@this, hResourcePtr, pLuid);
ret = ((delegate* unmanaged[Cdecl]<IDXGIFactory2*, T0*, Luid*, int>)LpVtbl[17])(@this, hResourcePtr, pLuid);
}
return ret;
}

/// <summary>To be documented.</summary>
public readonly int GetSharedResourceAdapterLuid<T0>(ref T0 hResource, ref ValueTuple<ulong, long> pLuid) where T0 : unmanaged
public readonly int GetSharedResourceAdapterLuid<T0>(ref T0 hResource, ref Luid pLuid) where T0 : unmanaged
{
var @this = (IDXGIFactory2*) Unsafe.AsPointer(ref Unsafe.AsRef(in this));
int ret = default;
fixed (T0* hResourcePtr = &hResource)
{
fixed (ValueTuple<ulong, long>* pLuidPtr = &pLuid)
fixed (Luid* pLuidPtr = &pLuid)
{
ret = ((delegate* unmanaged[Cdecl]<IDXGIFactory2*, T0*, ValueTuple<ulong, long>*, int>)LpVtbl[17])(@this, hResourcePtr, pLuidPtr);
ret = ((delegate* unmanaged[Cdecl]<IDXGIFactory2*, T0*, Luid*, int>)LpVtbl[17])(@this, hResourcePtr, pLuidPtr);
}
}
return ret;
Expand Down
20 changes: 10 additions & 10 deletions src/Microsoft/Silk.NET.DXGI/Structs/IDXGIFactory3.gen.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1647,48 +1647,48 @@ public readonly unsafe int CreateSwapChainForCoreWindow(ref Silk.NET.Core.Native
}

/// <summary>To be documented.</summary>
public readonly unsafe int GetSharedResourceAdapterLuid(void* hResource, ValueTuple<ulong, long>* pLuid)
public readonly unsafe int GetSharedResourceAdapterLuid(void* hResource, Luid* pLuid)
{
var @this = (IDXGIFactory3*) Unsafe.AsPointer(ref Unsafe.AsRef(in this));
int ret = default;
ret = ((delegate* unmanaged[Cdecl]<IDXGIFactory3*, void*, ValueTuple<ulong, long>*, int>)LpVtbl[17])(@this, hResource, pLuid);
ret = ((delegate* unmanaged[Cdecl]<IDXGIFactory3*, void*, Luid*, int>)LpVtbl[17])(@this, hResource, pLuid);
return ret;
}

/// <summary>To be documented.</summary>
public readonly unsafe int GetSharedResourceAdapterLuid(void* hResource, ref ValueTuple<ulong, long> pLuid)
public readonly unsafe int GetSharedResourceAdapterLuid(void* hResource, ref Luid pLuid)
{
var @this = (IDXGIFactory3*) Unsafe.AsPointer(ref Unsafe.AsRef(in this));
int ret = default;
fixed (ValueTuple<ulong, long>* pLuidPtr = &pLuid)
fixed (Luid* pLuidPtr = &pLuid)
{
ret = ((delegate* unmanaged[Cdecl]<IDXGIFactory3*, void*, ValueTuple<ulong, long>*, int>)LpVtbl[17])(@this, hResource, pLuidPtr);
ret = ((delegate* unmanaged[Cdecl]<IDXGIFactory3*, void*, Luid*, int>)LpVtbl[17])(@this, hResource, pLuidPtr);
}
return ret;
}

/// <summary>To be documented.</summary>
public readonly unsafe int GetSharedResourceAdapterLuid<T0>(ref T0 hResource, ValueTuple<ulong, long>* pLuid) where T0 : unmanaged
public readonly unsafe int GetSharedResourceAdapterLuid<T0>(ref T0 hResource, Luid* pLuid) where T0 : unmanaged
{
var @this = (IDXGIFactory3*) Unsafe.AsPointer(ref Unsafe.AsRef(in this));
int ret = default;
fixed (T0* hResourcePtr = &hResource)
{
ret = ((delegate* unmanaged[Cdecl]<IDXGIFactory3*, T0*, ValueTuple<ulong, long>*, int>)LpVtbl[17])(@this, hResourcePtr, pLuid);
ret = ((delegate* unmanaged[Cdecl]<IDXGIFactory3*, T0*, Luid*, int>)LpVtbl[17])(@this, hResourcePtr, pLuid);
}
return ret;
}

/// <summary>To be documented.</summary>
public readonly int GetSharedResourceAdapterLuid<T0>(ref T0 hResource, ref ValueTuple<ulong, long> pLuid) where T0 : unmanaged
public readonly int GetSharedResourceAdapterLuid<T0>(ref T0 hResource, ref Luid pLuid) where T0 : unmanaged
{
var @this = (IDXGIFactory3*) Unsafe.AsPointer(ref Unsafe.AsRef(in this));
int ret = default;
fixed (T0* hResourcePtr = &hResource)
{
fixed (ValueTuple<ulong, long>* pLuidPtr = &pLuid)
fixed (Luid* pLuidPtr = &pLuid)
{
ret = ((delegate* unmanaged[Cdecl]<IDXGIFactory3*, T0*, ValueTuple<ulong, long>*, int>)LpVtbl[17])(@this, hResourcePtr, pLuidPtr);
ret = ((delegate* unmanaged[Cdecl]<IDXGIFactory3*, T0*, Luid*, int>)LpVtbl[17])(@this, hResourcePtr, pLuidPtr);
}
}
return ret;
Expand Down
36 changes: 18 additions & 18 deletions src/Microsoft/Silk.NET.DXGI/Structs/IDXGIFactory4.gen.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1650,48 +1650,48 @@ public readonly unsafe int CreateSwapChainForCoreWindow(ref Silk.NET.Core.Native
}

/// <summary>To be documented.</summary>
public readonly unsafe int GetSharedResourceAdapterLuid(void* hResource, ValueTuple<ulong, long>* pLuid)
public readonly unsafe int GetSharedResourceAdapterLuid(void* hResource, Luid* pLuid)
{
var @this = (IDXGIFactory4*) Unsafe.AsPointer(ref Unsafe.AsRef(in this));
int ret = default;
ret = ((delegate* unmanaged[Cdecl]<IDXGIFactory4*, void*, ValueTuple<ulong, long>*, int>)LpVtbl[17])(@this, hResource, pLuid);
ret = ((delegate* unmanaged[Cdecl]<IDXGIFactory4*, void*, Luid*, int>)LpVtbl[17])(@this, hResource, pLuid);
return ret;
}

/// <summary>To be documented.</summary>
public readonly unsafe int GetSharedResourceAdapterLuid(void* hResource, ref ValueTuple<ulong, long> pLuid)
public readonly unsafe int GetSharedResourceAdapterLuid(void* hResource, ref Luid pLuid)
{
var @this = (IDXGIFactory4*) Unsafe.AsPointer(ref Unsafe.AsRef(in this));
int ret = default;
fixed (ValueTuple<ulong, long>* pLuidPtr = &pLuid)
fixed (Luid* pLuidPtr = &pLuid)
{
ret = ((delegate* unmanaged[Cdecl]<IDXGIFactory4*, void*, ValueTuple<ulong, long>*, int>)LpVtbl[17])(@this, hResource, pLuidPtr);
ret = ((delegate* unmanaged[Cdecl]<IDXGIFactory4*, void*, Luid*, int>)LpVtbl[17])(@this, hResource, pLuidPtr);
}
return ret;
}

/// <summary>To be documented.</summary>
public readonly unsafe int GetSharedResourceAdapterLuid<T0>(ref T0 hResource, ValueTuple<ulong, long>* pLuid) where T0 : unmanaged
public readonly unsafe int GetSharedResourceAdapterLuid<T0>(ref T0 hResource, Luid* pLuid) where T0 : unmanaged
{
var @this = (IDXGIFactory4*) Unsafe.AsPointer(ref Unsafe.AsRef(in this));
int ret = default;
fixed (T0* hResourcePtr = &hResource)
{
ret = ((delegate* unmanaged[Cdecl]<IDXGIFactory4*, T0*, ValueTuple<ulong, long>*, int>)LpVtbl[17])(@this, hResourcePtr, pLuid);
ret = ((delegate* unmanaged[Cdecl]<IDXGIFactory4*, T0*, Luid*, int>)LpVtbl[17])(@this, hResourcePtr, pLuid);
}
return ret;
}

/// <summary>To be documented.</summary>
public readonly int GetSharedResourceAdapterLuid<T0>(ref T0 hResource, ref ValueTuple<ulong, long> pLuid) where T0 : unmanaged
public readonly int GetSharedResourceAdapterLuid<T0>(ref T0 hResource, ref Luid pLuid) where T0 : unmanaged
{
var @this = (IDXGIFactory4*) Unsafe.AsPointer(ref Unsafe.AsRef(in this));
int ret = default;
fixed (T0* hResourcePtr = &hResource)
{
fixed (ValueTuple<ulong, long>* pLuidPtr = &pLuid)
fixed (Luid* pLuidPtr = &pLuid)
{
ret = ((delegate* unmanaged[Cdecl]<IDXGIFactory4*, T0*, ValueTuple<ulong, long>*, int>)LpVtbl[17])(@this, hResourcePtr, pLuidPtr);
ret = ((delegate* unmanaged[Cdecl]<IDXGIFactory4*, T0*, Luid*, int>)LpVtbl[17])(@this, hResourcePtr, pLuidPtr);
}
}
return ret;
Expand Down Expand Up @@ -2099,48 +2099,48 @@ public readonly uint GetCreationFlags()
}

/// <summary>To be documented.</summary>
public readonly unsafe int EnumAdapterByLuid(ValueTuple<ulong,long> AdapterLuid, Guid* riid, void** ppvAdapter)
public readonly unsafe int EnumAdapterByLuid(Luid AdapterLuid, Guid* riid, void** ppvAdapter)
{
var @this = (IDXGIFactory4*) Unsafe.AsPointer(ref Unsafe.AsRef(in this));
int ret = default;
ret = ((delegate* unmanaged[Cdecl]<IDXGIFactory4*, ValueTuple<ulong,long>, Guid*, void**, int>)LpVtbl[26])(@this, AdapterLuid, riid, ppvAdapter);
ret = ((delegate* unmanaged[Cdecl]<IDXGIFactory4*, Luid, Guid*, void**, int>)LpVtbl[26])(@this, AdapterLuid, riid, ppvAdapter);
return ret;
}

/// <summary>To be documented.</summary>
public readonly unsafe int EnumAdapterByLuid(ValueTuple<ulong,long> AdapterLuid, Guid* riid, ref void* ppvAdapter)
public readonly unsafe int EnumAdapterByLuid(Luid AdapterLuid, Guid* riid, ref void* ppvAdapter)
{
var @this = (IDXGIFactory4*) Unsafe.AsPointer(ref Unsafe.AsRef(in this));
int ret = default;
fixed (void** ppvAdapterPtr = &ppvAdapter)
{
ret = ((delegate* unmanaged[Cdecl]<IDXGIFactory4*, ValueTuple<ulong,long>, Guid*, void**, int>)LpVtbl[26])(@this, AdapterLuid, riid, ppvAdapterPtr);
ret = ((delegate* unmanaged[Cdecl]<IDXGIFactory4*, Luid, Guid*, void**, int>)LpVtbl[26])(@this, AdapterLuid, riid, ppvAdapterPtr);
}
return ret;
}

/// <summary>To be documented.</summary>
public readonly unsafe int EnumAdapterByLuid(ValueTuple<ulong,long> AdapterLuid, ref Guid riid, void** ppvAdapter)
public readonly unsafe int EnumAdapterByLuid(Luid AdapterLuid, ref Guid riid, void** ppvAdapter)
{
var @this = (IDXGIFactory4*) Unsafe.AsPointer(ref Unsafe.AsRef(in this));
int ret = default;
fixed (Guid* riidPtr = &riid)
{
ret = ((delegate* unmanaged[Cdecl]<IDXGIFactory4*, ValueTuple<ulong,long>, Guid*, void**, int>)LpVtbl[26])(@this, AdapterLuid, riidPtr, ppvAdapter);
ret = ((delegate* unmanaged[Cdecl]<IDXGIFactory4*, Luid, Guid*, void**, int>)LpVtbl[26])(@this, AdapterLuid, riidPtr, ppvAdapter);
}
return ret;
}

/// <summary>To be documented.</summary>
public readonly unsafe int EnumAdapterByLuid(ValueTuple<ulong,long> AdapterLuid, ref Guid riid, ref void* ppvAdapter)
public readonly unsafe int EnumAdapterByLuid(Luid AdapterLuid, ref Guid riid, ref void* ppvAdapter)
{
var @this = (IDXGIFactory4*) Unsafe.AsPointer(ref Unsafe.AsRef(in this));
int ret = default;
fixed (Guid* riidPtr = &riid)
{
fixed (void** ppvAdapterPtr = &ppvAdapter)
{
ret = ((delegate* unmanaged[Cdecl]<IDXGIFactory4*, ValueTuple<ulong,long>, Guid*, void**, int>)LpVtbl[26])(@this, AdapterLuid, riidPtr, ppvAdapterPtr);
ret = ((delegate* unmanaged[Cdecl]<IDXGIFactory4*, Luid, Guid*, void**, int>)LpVtbl[26])(@this, AdapterLuid, riidPtr, ppvAdapterPtr);
}
}
return ret;
Expand Down
Loading