Skip to content

Commit d168396

Browse files
ExaniteExanite
committed
Improve MixKhronosData name trimming rewind condition
This fixes a few cases where the trimmer fails to trim enum member names. Note that this affects both the Vulkan bindings and the OpenGL bindings. (cherry picked from commit 2df6cef)
1 parent cfdb477 commit d168396

20 files changed

+202
-195
lines changed

‎sources/OpenGL/OpenGL/Enums/FogPName.gen.cs

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33
// Ported from the OpenGL headers and corresponding dependencies.
44
// Original source is Copyright 2013-2020 The Khronos Group Inc. Licensed under the MIT license.
5+
using System;
6+
using System.Reflection;
57
using System.Runtime.CompilerServices;
68
using System.Runtime.InteropServices;
79

@@ -10,10 +12,10 @@ namespace Silk.NET.OpenGL;
1012
[Transformed]
1113
public enum FogPName : uint
1214
{
13-
FogIndex = unchecked((uint)0x0B61),
14-
FogDensity = unchecked((uint)0x0B62),
15-
FogStart = unchecked((uint)0x0B63),
16-
FogEnd = unchecked((uint)0x0B64),
17-
FogMode = unchecked((uint)0x0B65),
18-
FogCoordSrc = unchecked((uint)0x8450)
15+
Index = unchecked((uint)0x0B61),
16+
Density = unchecked((uint)0x0B62),
17+
Start = unchecked((uint)0x0B63),
18+
End = unchecked((uint)0x0B64),
19+
Mode = unchecked((uint)0x0B65),
20+
CoordSrc = unchecked((uint)0x8450),
1921
}

‎sources/OpenGL/OpenGL/Enums/FogParameter.gen.cs

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33
// Ported from the OpenGL headers and corresponding dependencies.
44
// Original source is Copyright 2013-2020 The Khronos Group Inc. Licensed under the MIT license.
5+
using System;
6+
using System.Reflection;
57
using System.Runtime.CompilerServices;
68
using System.Runtime.InteropServices;
79

@@ -10,11 +12,11 @@ namespace Silk.NET.OpenGL;
1012
[Transformed]
1113
public enum FogParameter : uint
1214
{
13-
FogIndex = unchecked((uint)0x0B61),
14-
FogDensity = unchecked((uint)0x0B62),
15-
FogStart = unchecked((uint)0x0B63),
16-
FogEnd = unchecked((uint)0x0B64),
17-
FogMode = unchecked((uint)0x0B65),
18-
FogColor = unchecked((uint)0x0B66),
19-
FogOffsetValueSGIX = unchecked((uint)0x8199)
15+
Index = unchecked((uint)0x0B61),
16+
Density = unchecked((uint)0x0B62),
17+
Start = unchecked((uint)0x0B63),
18+
End = unchecked((uint)0x0B64),
19+
Mode = unchecked((uint)0x0B65),
20+
Color = unchecked((uint)0x0B66),
21+
OffsetValueSGIX = unchecked((uint)0x8199),
2022
}

‎sources/OpenGL/OpenGL/Enums/GLEnum.gen.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -899,10 +899,10 @@ public enum GLEnum : uint
899899
CompressedRed = unchecked((uint)0x8225),
900900
CompressedRg = unchecked((uint)0x8226),
901901
ContextFlagForwardCompatibleBit = unchecked((uint)0x00000001),
902-
RGBA32F = unchecked((uint)0x8814),
903-
RGB32F = unchecked((uint)0x8815),
904-
RGBA16F = unchecked((uint)0x881A),
905-
RGB16F = unchecked((uint)0x881B),
902+
Rgba32F = unchecked((uint)0x8814),
903+
Rgb32F = unchecked((uint)0x8815),
904+
Rgba16F = unchecked((uint)0x881A),
905+
Rgb16F = unchecked((uint)0x881B),
906906
VertexAttribArrayInteger = unchecked((uint)0x88FD),
907907
MaxArrayTextureLayers = unchecked((uint)0x88FF),
908908
MinProgramTexelOffset = unchecked((uint)0x8904),
@@ -1101,8 +1101,8 @@ public enum GLEnum : uint
11011101
Rg16 = unchecked((uint)0x822C),
11021102
R16F = unchecked((uint)0x822D),
11031103
R32F = unchecked((uint)0x822E),
1104-
RG16F = unchecked((uint)0x822F),
1105-
RG32F = unchecked((uint)0x8230),
1104+
Rg16F = unchecked((uint)0x822F),
1105+
Rg32F = unchecked((uint)0x8230),
11061106
R8I = unchecked((uint)0x8231),
11071107
R8Ui = unchecked((uint)0x8232),
11081108
R16I = unchecked((uint)0x8233),
@@ -3453,7 +3453,7 @@ public enum GLEnum : uint
34533453
CompressedSrgbAlphaS3TcDxt1EXT = unchecked((uint)0x8C4D),
34543454
CompressedSrgbAlphaS3TcDxt3EXT = unchecked((uint)0x8C4E),
34553455
CompressedSrgbAlphaS3TcDxt5EXT = unchecked((uint)0x8C4F),
3456-
Sr8Ext = unchecked((uint)0x8FBD),
3456+
Sr8EXT = unchecked((uint)0x8FBD),
34573457
Srg8EXT = unchecked((uint)0x8FBE),
34583458
TextureSrgbDecodeEXT = unchecked((uint)0x8A48),
34593459
DecodeEXT = unchecked((uint)0x8A49),
@@ -3490,7 +3490,7 @@ public enum GLEnum : uint
34903490
LuminanceAlpha16FEXT = unchecked((uint)0x881F),
34913491
Bgra8EXT = unchecked((uint)0x93A1),
34923492
R8Ext = unchecked((uint)0x8229),
3493-
Rg8Ext = unchecked((uint)0x822B),
3493+
Rg8EXT = unchecked((uint)0x822B),
34943494
R32FExt = unchecked((uint)0x822E),
34953495
Rg32FEXT = unchecked((uint)0x8230),
34963496
R16FExt = unchecked((uint)0x822D),

‎sources/OpenGL/OpenGL/Enums/InternalFormat.gen.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,10 @@ public enum InternalFormat : uint
6161
CompressedSrgbAlpha = unchecked((uint)0x8C49),
6262
CompressedRed = unchecked((uint)0x8225),
6363
CompressedRg = unchecked((uint)0x8226),
64-
RGBA32F = unchecked((uint)0x8814),
65-
RGB32F = unchecked((uint)0x8815),
66-
RGBA16F = unchecked((uint)0x881A),
67-
RGB16F = unchecked((uint)0x881B),
64+
Rgba32F = unchecked((uint)0x8814),
65+
Rgb32F = unchecked((uint)0x8815),
66+
Rgba16F = unchecked((uint)0x881A),
67+
Rgb16F = unchecked((uint)0x881B),
6868
R11FG11FB10F = unchecked((uint)0x8C3A),
6969
Rgb9E5 = unchecked((uint)0x8C3D),
7070
Rgba32Ui = unchecked((uint)0x8D70),
@@ -98,8 +98,8 @@ public enum InternalFormat : uint
9898
Rg16 = unchecked((uint)0x822C),
9999
R16F = unchecked((uint)0x822D),
100100
R32F = unchecked((uint)0x822E),
101-
RG16F = unchecked((uint)0x822F),
102-
RG32F = unchecked((uint)0x8230),
101+
Rg16F = unchecked((uint)0x822F),
102+
Rg32F = unchecked((uint)0x8230),
103103
R8I = unchecked((uint)0x8231),
104104
R8Ui = unchecked((uint)0x8232),
105105
R16I = unchecked((uint)0x8233),
@@ -266,15 +266,15 @@ public enum InternalFormat : uint
266266
CompressedSrgbAlphaS3TcDxt1EXT = unchecked((uint)0x8C4D),
267267
CompressedSrgbAlphaS3TcDxt3EXT = unchecked((uint)0x8C4E),
268268
CompressedSrgbAlphaS3TcDxt5EXT = unchecked((uint)0x8C4F),
269-
Sr8Ext = unchecked((uint)0x8FBD),
269+
Sr8EXT = unchecked((uint)0x8FBD),
270270
Srg8EXT = unchecked((uint)0x8FBE),
271271
Rgb9E5EXT = unchecked((uint)0x8C3D),
272272
Rgba32FEXT = unchecked((uint)0x8814),
273273
Rgb32FEXT = unchecked((uint)0x8815),
274274
Rgba16FEXT = unchecked((uint)0x881A),
275275
Rgb16FEXT = unchecked((uint)0x881B),
276276
R8Ext = unchecked((uint)0x8229),
277-
Rg8Ext = unchecked((uint)0x822B),
277+
Rg8EXT = unchecked((uint)0x822B),
278278
R32FExt = unchecked((uint)0x822E),
279279
Rg32FEXT = unchecked((uint)0x8230),
280280
R16FExt = unchecked((uint)0x822D),

‎sources/OpenGL/OpenGL/Enums/SizedInternalFormat.gen.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@ public enum SizedInternalFormat : uint
4747
DepthComponent32 = unchecked((uint)0x81A7),
4848
Srgb8 = unchecked((uint)0x8C41),
4949
Srgb8Alpha8 = unchecked((uint)0x8C43),
50-
RGBA32F = unchecked((uint)0x8814),
51-
RGB32F = unchecked((uint)0x8815),
52-
RGBA16F = unchecked((uint)0x881A),
53-
RGB16F = unchecked((uint)0x881B),
50+
Rgba32F = unchecked((uint)0x8814),
51+
Rgb32F = unchecked((uint)0x8815),
52+
Rgba16F = unchecked((uint)0x881A),
53+
Rgb16F = unchecked((uint)0x881B),
5454
R11FG11FB10F = unchecked((uint)0x8C3A),
5555
Rgb9E5 = unchecked((uint)0x8C3D),
5656
Rgba32Ui = unchecked((uint)0x8D70),
@@ -82,8 +82,8 @@ public enum SizedInternalFormat : uint
8282
Rg16 = unchecked((uint)0x822C),
8383
R16F = unchecked((uint)0x822D),
8484
R32F = unchecked((uint)0x822E),
85-
RG16F = unchecked((uint)0x822F),
86-
RG32F = unchecked((uint)0x8230),
85+
Rg16F = unchecked((uint)0x822F),
86+
Rg32F = unchecked((uint)0x8230),
8787
R8I = unchecked((uint)0x8231),
8888
R8Ui = unchecked((uint)0x8232),
8989
R16I = unchecked((uint)0x8233),
@@ -253,7 +253,7 @@ public enum SizedInternalFormat : uint
253253
Rgba16FEXT = unchecked((uint)0x881A),
254254
Rgb16FEXT = unchecked((uint)0x881B),
255255
R8Ext = unchecked((uint)0x8229),
256-
Rg8Ext = unchecked((uint)0x822B),
256+
Rg8EXT = unchecked((uint)0x822B),
257257
R32FExt = unchecked((uint)0x822E),
258258
Rg32FEXT = unchecked((uint)0x8230),
259259
R16FExt = unchecked((uint)0x822D),

‎sources/OpenGL/OpenGL/Enums/SyncObjectMask.gen.cs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,17 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33
// Ported from the OpenGL headers and corresponding dependencies.
44
// Original source is Copyright 2013-2020 The Khronos Group Inc. Licensed under the MIT license.
5+
using System;
6+
using System.Reflection;
57
using System.Runtime.CompilerServices;
68
using System.Runtime.InteropServices;
79

810
namespace Silk.NET.OpenGL;
911

1012
[Transformed]
13+
[Flags]
1114
public enum SyncObjectMask : uint
1215
{
13-
SyncFlushCommandsBit = unchecked((uint)0x00000001),
14-
SyncFlushCommandsBitApple = unchecked((uint)0x00000001)
16+
Bit = unchecked((uint)0x00000001),
17+
BitApple = unchecked((uint)0x00000001),
1518
}

‎sources/SilkTouch/SilkTouch/Mods/MixKhronosData.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1131,17 +1131,17 @@ ref string? identifiedPrefix
11311131
);
11321132
}
11331133

1134-
// Sometimes we get a little overzealous, so let's unwind back to just the GL_ being snipped
1134+
// NameTrimmer trims member names by looking for a common prefix and removing it
1135+
// This sometimes trims too much and leads to only the vendor suffix remaining
1136+
// This is bad so we rewind back to the previous name (minus the prefix, such as GL_)
11351137
var rewind = false;
11361138
if (container is not null && job.Groups.ContainsKey(container))
11371139
{
11381140
foreach (var (_, (current, previous)) in names)
11391141
{
11401142
var prev = previous?.FirstOrDefault();
1141-
if (
1142-
prev is not null
1143-
&& current.AsSpan().Count('_') - prev.AsSpan().Count('_') <= 1
1144-
&& (current.Length <= 4 || (job.Vendors?.Contains(current) ?? false))
1143+
if (prev is not null
1144+
&& (job.Vendors?.Contains(current.Trim('_')) ?? false)
11451145
)
11461146
{
11471147
rewind = true;

‎sources/Vulkan/Vulkan/Vulkan/BlendFactor.gen.cs

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -18,131 +18,131 @@ public enum BlendFactor : uint
1818
["VK_VERSION_1_0", "VK_VERSION_1_1", "VK_VERSION_1_2", "VK_VERSION_1_3", "VK_VERSION_1_4"],
1919
MinVersion = "1.0"
2020
)]
21-
BlendFactorZero = 0,
21+
Zero = 0,
2222

2323
[SupportedApiProfile(
2424
"vulkan",
2525
["VK_VERSION_1_0", "VK_VERSION_1_1", "VK_VERSION_1_2", "VK_VERSION_1_3", "VK_VERSION_1_4"],
2626
MinVersion = "1.0"
2727
)]
28-
BlendFactorOne = 1,
28+
One = 1,
2929

3030
[SupportedApiProfile(
3131
"vulkan",
3232
["VK_VERSION_1_0", "VK_VERSION_1_1", "VK_VERSION_1_2", "VK_VERSION_1_3", "VK_VERSION_1_4"],
3333
MinVersion = "1.0"
3434
)]
35-
BlendFactorSrcColor = 2,
35+
SrcColor = 2,
3636

3737
[SupportedApiProfile(
3838
"vulkan",
3939
["VK_VERSION_1_0", "VK_VERSION_1_1", "VK_VERSION_1_2", "VK_VERSION_1_3", "VK_VERSION_1_4"],
4040
MinVersion = "1.0"
4141
)]
42-
BlendFactorOneMinusSrcColor = 3,
42+
OneMinusSrcColor = 3,
4343

4444
[SupportedApiProfile(
4545
"vulkan",
4646
["VK_VERSION_1_0", "VK_VERSION_1_1", "VK_VERSION_1_2", "VK_VERSION_1_3", "VK_VERSION_1_4"],
4747
MinVersion = "1.0"
4848
)]
49-
BlendFactorDstColor = 4,
49+
DstColor = 4,
5050

5151
[SupportedApiProfile(
5252
"vulkan",
5353
["VK_VERSION_1_0", "VK_VERSION_1_1", "VK_VERSION_1_2", "VK_VERSION_1_3", "VK_VERSION_1_4"],
5454
MinVersion = "1.0"
5555
)]
56-
BlendFactorOneMinusDstColor = 5,
56+
OneMinusDstColor = 5,
5757

5858
[SupportedApiProfile(
5959
"vulkan",
6060
["VK_VERSION_1_0", "VK_VERSION_1_1", "VK_VERSION_1_2", "VK_VERSION_1_3", "VK_VERSION_1_4"],
6161
MinVersion = "1.0"
6262
)]
63-
BlendFactorSrcAlpha = 6,
63+
SrcAlpha = 6,
6464

6565
[SupportedApiProfile(
6666
"vulkan",
6767
["VK_VERSION_1_0", "VK_VERSION_1_1", "VK_VERSION_1_2", "VK_VERSION_1_3", "VK_VERSION_1_4"],
6868
MinVersion = "1.0"
6969
)]
70-
BlendFactorOneMinusSrcAlpha = 7,
70+
OneMinusSrcAlpha = 7,
7171

7272
[SupportedApiProfile(
7373
"vulkan",
7474
["VK_VERSION_1_0", "VK_VERSION_1_1", "VK_VERSION_1_2", "VK_VERSION_1_3", "VK_VERSION_1_4"],
7575
MinVersion = "1.0"
7676
)]
77-
BlendFactorDstAlpha = 8,
77+
DstAlpha = 8,
7878

7979
[SupportedApiProfile(
8080
"vulkan",
8181
["VK_VERSION_1_0", "VK_VERSION_1_1", "VK_VERSION_1_2", "VK_VERSION_1_3", "VK_VERSION_1_4"],
8282
MinVersion = "1.0"
8383
)]
84-
BlendFactorOneMinusDstAlpha = 9,
84+
OneMinusDstAlpha = 9,
8585

8686
[SupportedApiProfile(
8787
"vulkan",
8888
["VK_VERSION_1_0", "VK_VERSION_1_1", "VK_VERSION_1_2", "VK_VERSION_1_3", "VK_VERSION_1_4"],
8989
MinVersion = "1.0"
9090
)]
91-
BlendFactorConstantColor = 10,
91+
ConstantColor = 10,
9292

9393
[SupportedApiProfile(
9494
"vulkan",
9595
["VK_VERSION_1_0", "VK_VERSION_1_1", "VK_VERSION_1_2", "VK_VERSION_1_3", "VK_VERSION_1_4"],
9696
MinVersion = "1.0"
9797
)]
98-
BlendFactorOneMinusConstantColor = 11,
98+
OneMinusConstantColor = 11,
9999

100100
[SupportedApiProfile(
101101
"vulkan",
102102
["VK_VERSION_1_0", "VK_VERSION_1_1", "VK_VERSION_1_2", "VK_VERSION_1_3", "VK_VERSION_1_4"],
103103
MinVersion = "1.0"
104104
)]
105-
BlendFactorConstantAlpha = 12,
105+
ConstantAlpha = 12,
106106

107107
[SupportedApiProfile(
108108
"vulkan",
109109
["VK_VERSION_1_0", "VK_VERSION_1_1", "VK_VERSION_1_2", "VK_VERSION_1_3", "VK_VERSION_1_4"],
110110
MinVersion = "1.0"
111111
)]
112-
BlendFactorOneMinusConstantAlpha = 13,
112+
OneMinusConstantAlpha = 13,
113113

114114
[SupportedApiProfile(
115115
"vulkan",
116116
["VK_VERSION_1_0", "VK_VERSION_1_1", "VK_VERSION_1_2", "VK_VERSION_1_3", "VK_VERSION_1_4"],
117117
MinVersion = "1.0"
118118
)]
119-
BlendFactorSrcAlphaSaturate = 14,
119+
SrcAlphaSaturate = 14,
120120

121121
[SupportedApiProfile(
122122
"vulkan",
123123
["VK_VERSION_1_0", "VK_VERSION_1_1", "VK_VERSION_1_2", "VK_VERSION_1_3", "VK_VERSION_1_4"],
124124
MinVersion = "1.0"
125125
)]
126-
BlendFactorSrc1Color = 15,
126+
Src1Color = 15,
127127

128128
[SupportedApiProfile(
129129
"vulkan",
130130
["VK_VERSION_1_0", "VK_VERSION_1_1", "VK_VERSION_1_2", "VK_VERSION_1_3", "VK_VERSION_1_4"],
131131
MinVersion = "1.0"
132132
)]
133-
BlendFactorOneMinusSrc1Color = 16,
133+
OneMinusSrc1Color = 16,
134134

135135
[SupportedApiProfile(
136136
"vulkan",
137137
["VK_VERSION_1_0", "VK_VERSION_1_1", "VK_VERSION_1_2", "VK_VERSION_1_3", "VK_VERSION_1_4"],
138138
MinVersion = "1.0"
139139
)]
140-
BlendFactorSrc1Alpha = 17,
140+
Src1Alpha = 17,
141141

142142
[SupportedApiProfile(
143143
"vulkan",
144144
["VK_VERSION_1_0", "VK_VERSION_1_1", "VK_VERSION_1_2", "VK_VERSION_1_3", "VK_VERSION_1_4"],
145145
MinVersion = "1.0"
146146
)]
147-
BlendFactorOneMinusSrc1Alpha = 18,
147+
OneMinusSrc1Alpha = 18,
148148
}

0 commit comments

Comments
 (0)