Skip to content

Commit f64b57b

Browse files
committed
oops webgpu was borked
1 parent 8518d32 commit f64b57b

File tree

49 files changed

+1545
-1695
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+1545
-1695
lines changed

build/cache/webgpu.json.gz

1.12 KB
Binary file not shown.

generator.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2811,7 +2811,7 @@
28112811
"-Wno-nonportable-include-path",
28122812
"-Wno-pragma-pack",
28132813
"-I$windowsSdkIncludes",
2814-
"-Ibuild/submodules/wgpu-native/ffi/webgpu-headers"
2814+
"-Ibuild/submodules/wgpu-native/ffi"
28152815
],
28162816
"traverse": [
28172817
"build/submodules/webgpu-headers/*.h",
Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,94 @@
1+
// Licensed to the .NET Foundation under one or more agreements.
2+
// The .NET Foundation licenses this file to you under the MIT license.
3+
4+
5+
using System;
6+
using System.Runtime.InteropServices;
7+
using System.Runtime.CompilerServices;
8+
using System.Text;
9+
using Silk.NET.Core;
10+
using Silk.NET.Core.Native;
11+
using Silk.NET.Core.Attributes;
12+
using Silk.NET.Core.Contexts;
13+
using Silk.NET.Core.Loader;
14+
15+
#pragma warning disable 1591
16+
17+
namespace Silk.NET.Core.Win32Extras
18+
{
19+
[NativeName("Name", "__MIDL___MIDL_itf_documenttarget_0000_0002_0001")]
20+
public unsafe partial struct MIDLMIDLItfDocumentTarget000000020001
21+
{
22+
public MIDLMIDLItfDocumentTarget000000020001
23+
(
24+
uint? jobId = null,
25+
int? currentDocument = null,
26+
int? currentPage = null,
27+
int? currentPageTotal = null,
28+
PrintDocumentPackageCompletion? completion = null,
29+
int? packageStatus = null
30+
) : this()
31+
{
32+
if (jobId is not null)
33+
{
34+
JobId = jobId.Value;
35+
}
36+
37+
if (currentDocument is not null)
38+
{
39+
CurrentDocument = currentDocument.Value;
40+
}
41+
42+
if (currentPage is not null)
43+
{
44+
CurrentPage = currentPage.Value;
45+
}
46+
47+
if (currentPageTotal is not null)
48+
{
49+
CurrentPageTotal = currentPageTotal.Value;
50+
}
51+
52+
if (completion is not null)
53+
{
54+
Completion = completion.Value;
55+
}
56+
57+
if (packageStatus is not null)
58+
{
59+
PackageStatus = packageStatus.Value;
60+
}
61+
}
62+
63+
64+
[NativeName("Type", "UINT32")]
65+
[NativeName("Type.Name", "UINT32")]
66+
[NativeName("Name", "JobId")]
67+
public uint JobId;
68+
69+
[NativeName("Type", "INT32")]
70+
[NativeName("Type.Name", "INT32")]
71+
[NativeName("Name", "CurrentDocument")]
72+
public int CurrentDocument;
73+
74+
[NativeName("Type", "INT32")]
75+
[NativeName("Type.Name", "INT32")]
76+
[NativeName("Name", "CurrentPage")]
77+
public int CurrentPage;
78+
79+
[NativeName("Type", "INT32")]
80+
[NativeName("Type.Name", "INT32")]
81+
[NativeName("Name", "CurrentPageTotal")]
82+
public int CurrentPageTotal;
83+
84+
[NativeName("Type", "PrintDocumentPackageCompletion")]
85+
[NativeName("Type.Name", "PrintDocumentPackageCompletion")]
86+
[NativeName("Name", "Completion")]
87+
public PrintDocumentPackageCompletion Completion;
88+
89+
[NativeName("Type", "HRESULT")]
90+
[NativeName("Type.Name", "HRESULT")]
91+
[NativeName("Name", "PackageStatus")]
92+
public int PackageStatus;
93+
}
94+
}

src/WebGPU/Extensions/Silk.NET.WebGPU.Extensions.Dawn/Dawn.gen.cs

Lines changed: 327 additions & 192 deletions
Large diffs are not rendered by default.

src/WebGPU/Extensions/Silk.NET.WebGPU.Extensions.Dawn/DawnOverloads.gen.cs

Lines changed: 92 additions & 76 deletions
Large diffs are not rendered by default.

src/WebGPU/Extensions/Silk.NET.WebGPU.Extensions.Dawn/Enums/CallbackMode.gen.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ namespace Silk.NET.WebGPU.Extensions.Dawn
1313
public enum CallbackMode : int
1414
{
1515
[NativeName("Name", "WGPUCallbackMode_WaitAnyOnly")]
16-
WaitAnyOnly = 0x0,
16+
WaitAnyOnly = 0x1,
1717
[NativeName("Name", "WGPUCallbackMode_AllowProcessEvents")]
18-
AllowProcessEvents = 0x1,
18+
AllowProcessEvents = 0x2,
1919
[NativeName("Name", "WGPUCallbackMode_AllowSpontaneous")]
20-
AllowSpontaneous = 0x2,
20+
AllowSpontaneous = 0x3,
2121
[NativeName("Name", "WGPUCallbackMode_Force32")]
2222
Force32 = 0x7FFFFFFF,
2323
}
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
// Licensed to the .NET Foundation under one or more agreements.
2+
// The .NET Foundation licenses this file to you under the MIT license.
3+
4+
5+
using System;
6+
using Silk.NET.Core.Attributes;
7+
8+
#pragma warning disable 1591
9+
10+
namespace Silk.NET.WebGPU.Extensions.Dawn
11+
{
12+
[NativeName("Name", "WGPUStatus")]
13+
public enum Status : int
14+
{
15+
[NativeName("Name", "WGPUStatus_Success")]
16+
Success = 0x0,
17+
[NativeName("Name", "WGPUStatus_Error")]
18+
Error = 0x1,
19+
[NativeName("Name", "WGPUStatus_Force32")]
20+
Force32 = 0x7FFFFFFF,
21+
}
22+
}

src/WebGPU/Extensions/Silk.NET.WebGPU.Extensions.WGPU/Structs/SurfaceConfigurationExtras.gen.cs renamed to src/WebGPU/Extensions/Silk.NET.WebGPU.Extensions.Dawn/Structs/ColorTargetStateExpandResolveTextureDawn.gen.cs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,25 +14,25 @@
1414

1515
#pragma warning disable 1591
1616

17-
namespace Silk.NET.WebGPU.Extensions.WGPU
17+
namespace Silk.NET.WebGPU.Extensions.Dawn
1818
{
19-
[NativeName("Name", "WGPUSurfaceConfigurationExtras")]
20-
public unsafe partial struct SurfaceConfigurationExtras
19+
[NativeName("Name", "WGPUColorTargetStateExpandResolveTextureDawn")]
20+
public unsafe partial struct ColorTargetStateExpandResolveTextureDawn
2121
{
22-
public SurfaceConfigurationExtras
22+
public ColorTargetStateExpandResolveTextureDawn
2323
(
2424
ChainedStruct? chain = null,
25-
Silk.NET.Core.Bool32? desiredMaximumFrameLatency = null
25+
Silk.NET.Core.Bool32? enabled = null
2626
) : this()
2727
{
2828
if (chain is not null)
2929
{
3030
Chain = chain.Value;
3131
}
3232

33-
if (desiredMaximumFrameLatency is not null)
33+
if (enabled is not null)
3434
{
35-
DesiredMaximumFrameLatency = desiredMaximumFrameLatency.Value;
35+
Enabled = enabled.Value;
3636
}
3737
}
3838

@@ -44,7 +44,7 @@ public SurfaceConfigurationExtras
4444

4545
[NativeName("Type", "WGPUBool")]
4646
[NativeName("Type.Name", "WGPUBool")]
47-
[NativeName("Name", "desiredMaximumFrameLatency")]
48-
public Silk.NET.Core.Bool32 DesiredMaximumFrameLatency;
47+
[NativeName("Name", "enabled")]
48+
public Silk.NET.Core.Bool32 Enabled;
4949
}
5050
}
Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
// Licensed to the .NET Foundation under one or more agreements.
2+
// The .NET Foundation licenses this file to you under the MIT license.
3+
4+
5+
using System;
6+
using System.Runtime.InteropServices;
7+
using System.Runtime.CompilerServices;
8+
using System.Text;
9+
using Silk.NET.Core;
10+
using Silk.NET.Core.Native;
11+
using Silk.NET.Core.Attributes;
12+
using Silk.NET.Core.Contexts;
13+
using Silk.NET.Core.Loader;
14+
15+
#pragma warning disable 1591
16+
17+
namespace Silk.NET.WebGPU.Extensions.Dawn
18+
{
19+
[NativeName("Name", "WGPUDeviceLostCallbackInfo")]
20+
public unsafe partial struct DeviceLostCallbackInfo
21+
{
22+
public DeviceLostCallbackInfo
23+
(
24+
ChainedStruct* nextInChain = null,
25+
CallbackMode? mode = null,
26+
PfnDeviceLostCallbackNew? callback = null,
27+
void* userdata = null
28+
) : this()
29+
{
30+
if (nextInChain is not null)
31+
{
32+
NextInChain = nextInChain;
33+
}
34+
35+
if (mode is not null)
36+
{
37+
Mode = mode.Value;
38+
}
39+
40+
if (callback is not null)
41+
{
42+
Callback = callback.Value;
43+
}
44+
45+
if (userdata is not null)
46+
{
47+
Userdata = userdata;
48+
}
49+
}
50+
51+
52+
[NativeName("Type", "const WGPUChainedStruct *")]
53+
[NativeName("Type.Name", "const WGPUChainedStruct *")]
54+
[NativeName("Name", "nextInChain")]
55+
public ChainedStruct* NextInChain;
56+
57+
[NativeName("Type", "WGPUCallbackMode")]
58+
[NativeName("Type.Name", "WGPUCallbackMode")]
59+
[NativeName("Name", "mode")]
60+
public CallbackMode Mode;
61+
62+
[NativeName("Type", "WGPUDeviceLostCallbackNew")]
63+
[NativeName("Type.Name", "WGPUDeviceLostCallbackNew")]
64+
[NativeName("Name", "callback")]
65+
public PfnDeviceLostCallbackNew Callback;
66+
67+
[NativeName("Type", "void *")]
68+
[NativeName("Type.Name", "void *")]
69+
[NativeName("Name", "userdata")]
70+
public void* Userdata;
71+
}
72+
}

src/WebGPU/Extensions/Silk.NET.WebGPU.Extensions.Dawn/Structs/ExternalTextureDescriptor.gen.cs

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ public ExternalTextureDescriptor
3232
float* srcTransferFunctionParameters = null,
3333
float* dstTransferFunctionParameters = null,
3434
float* gamutConversionMatrix = null,
35-
Silk.NET.Core.Bool32? flipY = null,
3635
Silk.NET.Core.Bool32? mirrored = null,
3736
ExternalTextureRotation? rotation = null
3837
) : this()
@@ -92,11 +91,6 @@ public ExternalTextureDescriptor
9291
GamutConversionMatrix = gamutConversionMatrix;
9392
}
9493

95-
if (flipY is not null)
96-
{
97-
FlipY = flipY.Value;
98-
}
99-
10094
if (mirrored is not null)
10195
{
10296
Mirrored = mirrored.Value;
@@ -164,11 +158,6 @@ public ExternalTextureDescriptor
164158
[NativeName("Name", "gamutConversionMatrix")]
165159
public float* GamutConversionMatrix;
166160

167-
[NativeName("Type", "WGPUBool")]
168-
[NativeName("Type.Name", "WGPUBool")]
169-
[NativeName("Name", "flipY")]
170-
public Silk.NET.Core.Bool32 FlipY;
171-
172161
[NativeName("Type", "WGPUBool")]
173162
[NativeName("Type.Name", "WGPUBool")]
174163
[NativeName("Name", "mirrored")]

0 commit comments

Comments
 (0)