Skip to content

Commit 4eb60a8

Browse files
committed
Exclude WebGPU, SDL; fix Vulkan missing APIs.
1 parent 6516adb commit 4eb60a8

File tree

249 files changed

+10957
-7556
lines changed

Some content is hidden

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

249 files changed

+10957
-7556
lines changed

build/cache/sdl.json.gz

0 Bytes
Binary file not shown.

build/cache/vulkan.json.gz

0 Bytes
Binary file not shown.

build/cache/webgpu.json.gz

-229 Bytes
Binary file not shown.

generator.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -707,7 +707,8 @@
707707
"clang": {},
708708
"bakery": {
709709
"profileNames": [
710-
"vulkan"
710+
"vulkan",
711+
"vulkanbase"
711712
]
712713
},
713714
"exclude": [
@@ -2473,7 +2474,7 @@
24732474
},
24742475
"bakery": {
24752476
"profileNames": [
2476-
"silk.net.core.direct3d12"
2477+
"silk.net.direct3d12"
24772478
]
24782479
},
24792480
"output": {
@@ -3555,4 +3556,4 @@
35553556
]
35563557
}
35573558
]
3558-
}
3559+
}

src/Core/Silk.NET.BuildTools/Common/Enums/Enum.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ public class Enum : IProfileConstituent
2828
/// </summary>
2929
public string NativeName { get; set; } = string.Empty;
3030

31-
[JsonIgnore]
31+
//[JsonIgnore]
3232
public string ProfileName { get; set; }
3333

34-
[JsonIgnore]
34+
//[JsonIgnore]
3535
public Version ProfileVersion { get; set; }
3636

3737
[JsonIgnore]

src/Core/Silk.NET.BuildTools/Common/Functions/Function.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ public class Function : IEquatable<Function>, IProfileConstituent
3333
/// </summary>
3434
public string NativeName { get; set; }
3535

36-
[JsonIgnore]
36+
//[JsonIgnore]
3737
public string ProfileName { get; set; }
38-
[JsonIgnore]
38+
//[JsonIgnore]
3939
public Version ProfileVersion { get; set; }
4040

4141
/// <summary>

src/Core/Silk.NET.BuildTools/Common/Struct.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,10 @@ public class Struct : IProfileConstituent
3030
/// </summary>
3131
public string ExtensionName { get; set; }
3232

33-
[JsonIgnore] public string ProfileName { get; set; }
34-
[JsonIgnore] public Version ProfileVersion { get; set; }
33+
//[JsonIgnore]
34+
public string ProfileName { get; set; }
35+
//[JsonIgnore]
36+
public Version ProfileVersion { get; set; }
3537
[JsonIgnore] public string[] ClangMetadata { get; set; }
3638

3739
/// <summary>

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public class EnumDefinition
3434
/// <summary>
3535
/// The specific API this enum is applicable to.
3636
/// </summary>
37-
public string? Api { get; }
37+
public string[]? Api { get; }
3838

3939
/// <summary>
4040
/// The enum definition.
@@ -44,6 +44,10 @@ public class EnumDefinition
4444
/// <param name="values">The values of the enum.</param>
4545
/// <param name="bitWidth">The bit width of the enum.</param>
4646
public EnumDefinition(string name, EnumType type, EnumValue[] values, int bitWidth, string? api)
47+
:this(name, type, values, bitWidth, api?.Split(','))
48+
{
49+
}
50+
public EnumDefinition(string name, EnumType type, EnumValue[] values, int bitWidth, string[]? api)
4751
{
4852
Require.NotNullOrEmpty(name);
4953
Require.NotNull(values);

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public class HandleDefinition
2828
/// <summary>
2929
/// The specific API this handle is applicable to.
3030
/// </summary>
31-
public string? Api { get; }
31+
public string[]? Api { get; }
3232

3333
/// <summary>
3434
/// Create a new HandleDefinition.
@@ -37,6 +37,10 @@ public class HandleDefinition
3737
/// <param name="canBeDispatched">Whether or not this handle can be dispatched.</param>
3838
/// <param name="parent">The parent of this handle.</param>
3939
public HandleDefinition(string name, bool canBeDispatched, string parent, string? api)
40+
: this(name, canBeDispatched, parent, api?.Split(','))
41+
{
42+
}
43+
public HandleDefinition(string name, bool canBeDispatched, string parent, string[]? api)
4044
{
4145
Name = name;
4246
CanBeDispatched = canBeDispatched;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public class StructureDefinition
1515
public string Alias { get; }
1616
public MemberSpec[] Members { get; }
1717
public IReadOnlyList<string> Extends { get; }
18-
public string? Api { get; }
18+
public string[]? Api { get; }
1919

2020
public StructureDefinition(string name, string alias, MemberSpec[] members, string extends, string? api)
2121
{
@@ -25,7 +25,7 @@ public StructureDefinition(string name, string alias, MemberSpec[] members, stri
2525
Extends = string.IsNullOrWhiteSpace(extends)
2626
? Array.Empty<string>()
2727
: extends.Split(',', StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries);
28-
Api = api;
28+
Api = api?.Split(',');
2929
}
3030

3131
public static StructureDefinition CreateFromXml(XElement xe)

0 commit comments

Comments
 (0)