Skip to content

Commit 2df6cef

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.
1 parent 2f57d49 commit 2df6cef

22 files changed

+195
-195
lines changed

‎.silktouch/ac001027d53000e0.stout‎

0 Bytes
Binary file not shown.

‎.silktouch/c8c046b328b09d23.stout‎

0 Bytes
Binary file not shown.

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ namespace Silk.NET.OpenGL;
1212
[Transformed]
1313
public enum FogPName : uint
1414
{
15-
FogIndex = unchecked((uint)0x0B61),
16-
FogDensity = unchecked((uint)0x0B62),
17-
FogStart = unchecked((uint)0x0B63),
18-
FogEnd = unchecked((uint)0x0B64),
19-
FogMode = unchecked((uint)0x0B65),
20-
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),
2121
}

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ namespace Silk.NET.OpenGL;
1212
[Transformed]
1313
public enum FogParameter : uint
1414
{
15-
FogIndex = unchecked((uint)0x0B61),
16-
FogDensity = unchecked((uint)0x0B62),
17-
FogStart = unchecked((uint)0x0B63),
18-
FogEnd = unchecked((uint)0x0B64),
19-
FogMode = unchecked((uint)0x0B65),
20-
FogColor = unchecked((uint)0x0B66),
21-
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),
2222
}

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -901,10 +901,10 @@ public enum GLEnum : uint
901901
CompressedRed = unchecked((uint)0x8225),
902902
CompressedRg = unchecked((uint)0x8226),
903903
ContextFlagForwardCompatibleBit = unchecked((uint)0x00000001),
904-
RGBA32F = unchecked((uint)0x8814),
905-
RGB32F = unchecked((uint)0x8815),
906-
RGBA16F = unchecked((uint)0x881A),
907-
RGB16F = unchecked((uint)0x881B),
904+
Rgba32F = unchecked((uint)0x8814),
905+
Rgb32F = unchecked((uint)0x8815),
906+
Rgba16F = unchecked((uint)0x881A),
907+
Rgb16F = unchecked((uint)0x881B),
908908
VertexAttribArrayInteger = unchecked((uint)0x88FD),
909909
MaxArrayTextureLayers = unchecked((uint)0x88FF),
910910
MinProgramTexelOffset = unchecked((uint)0x8904),
@@ -1103,8 +1103,8 @@ public enum GLEnum : uint
11031103
Rg16 = unchecked((uint)0x822C),
11041104
R16F = unchecked((uint)0x822D),
11051105
R32F = unchecked((uint)0x822E),
1106-
RG16F = unchecked((uint)0x822F),
1107-
RG32F = unchecked((uint)0x8230),
1106+
Rg16F = unchecked((uint)0x822F),
1107+
Rg32F = unchecked((uint)0x8230),
11081108
R8I = unchecked((uint)0x8231),
11091109
R8Ui = unchecked((uint)0x8232),
11101110
R16I = unchecked((uint)0x8233),
@@ -3455,7 +3455,7 @@ public enum GLEnum : uint
34553455
CompressedSrgbAlphaS3TcDxt1EXT = unchecked((uint)0x8C4D),
34563456
CompressedSrgbAlphaS3TcDxt3EXT = unchecked((uint)0x8C4E),
34573457
CompressedSrgbAlphaS3TcDxt5EXT = unchecked((uint)0x8C4F),
3458-
Sr8Ext = unchecked((uint)0x8FBD),
3458+
Sr8EXT = unchecked((uint)0x8FBD),
34593459
Srg8EXT = unchecked((uint)0x8FBE),
34603460
TextureSrgbDecodeEXT = unchecked((uint)0x8A48),
34613461
DecodeEXT = unchecked((uint)0x8A49),
@@ -3492,7 +3492,7 @@ public enum GLEnum : uint
34923492
LuminanceAlpha16FEXT = unchecked((uint)0x881F),
34933493
Bgra8EXT = unchecked((uint)0x93A1),
34943494
R8Ext = unchecked((uint)0x8229),
3495-
Rg8Ext = unchecked((uint)0x822B),
3495+
Rg8EXT = unchecked((uint)0x822B),
34963496
R32FExt = unchecked((uint)0x822E),
34973497
Rg32FEXT = unchecked((uint)0x8230),
34983498
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
@@ -63,10 +63,10 @@ public enum InternalFormat : uint
6363
CompressedSrgbAlpha = unchecked((uint)0x8C49),
6464
CompressedRed = unchecked((uint)0x8225),
6565
CompressedRg = unchecked((uint)0x8226),
66-
RGBA32F = unchecked((uint)0x8814),
67-
RGB32F = unchecked((uint)0x8815),
68-
RGBA16F = unchecked((uint)0x881A),
69-
RGB16F = unchecked((uint)0x881B),
66+
Rgba32F = unchecked((uint)0x8814),
67+
Rgb32F = unchecked((uint)0x8815),
68+
Rgba16F = unchecked((uint)0x881A),
69+
Rgb16F = unchecked((uint)0x881B),
7070
R11FG11FB10F = unchecked((uint)0x8C3A),
7171
Rgb9E5 = unchecked((uint)0x8C3D),
7272
Rgba32Ui = unchecked((uint)0x8D70),
@@ -100,8 +100,8 @@ public enum InternalFormat : uint
100100
Rg16 = unchecked((uint)0x822C),
101101
R16F = unchecked((uint)0x822D),
102102
R32F = unchecked((uint)0x822E),
103-
RG16F = unchecked((uint)0x822F),
104-
RG32F = unchecked((uint)0x8230),
103+
Rg16F = unchecked((uint)0x822F),
104+
Rg32F = unchecked((uint)0x8230),
105105
R8I = unchecked((uint)0x8231),
106106
R8Ui = unchecked((uint)0x8232),
107107
R16I = unchecked((uint)0x8233),
@@ -268,15 +268,15 @@ public enum InternalFormat : uint
268268
CompressedSrgbAlphaS3TcDxt1EXT = unchecked((uint)0x8C4D),
269269
CompressedSrgbAlphaS3TcDxt3EXT = unchecked((uint)0x8C4E),
270270
CompressedSrgbAlphaS3TcDxt5EXT = unchecked((uint)0x8C4F),
271-
Sr8Ext = unchecked((uint)0x8FBD),
271+
Sr8EXT = unchecked((uint)0x8FBD),
272272
Srg8EXT = unchecked((uint)0x8FBE),
273273
Rgb9E5EXT = unchecked((uint)0x8C3D),
274274
Rgba32FEXT = unchecked((uint)0x8814),
275275
Rgb32FEXT = unchecked((uint)0x8815),
276276
Rgba16FEXT = unchecked((uint)0x881A),
277277
Rgb16FEXT = unchecked((uint)0x881B),
278278
R8Ext = unchecked((uint)0x8229),
279-
Rg8Ext = unchecked((uint)0x822B),
279+
Rg8EXT = unchecked((uint)0x822B),
280280
R32FExt = unchecked((uint)0x822E),
281281
Rg32FEXT = unchecked((uint)0x8230),
282282
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
@@ -49,10 +49,10 @@ public enum SizedInternalFormat : uint
4949
DepthComponent32 = unchecked((uint)0x81A7),
5050
Srgb8 = unchecked((uint)0x8C41),
5151
Srgb8Alpha8 = unchecked((uint)0x8C43),
52-
RGBA32F = unchecked((uint)0x8814),
53-
RGB32F = unchecked((uint)0x8815),
54-
RGBA16F = unchecked((uint)0x881A),
55-
RGB16F = unchecked((uint)0x881B),
52+
Rgba32F = unchecked((uint)0x8814),
53+
Rgb32F = unchecked((uint)0x8815),
54+
Rgba16F = unchecked((uint)0x881A),
55+
Rgb16F = unchecked((uint)0x881B),
5656
R11FG11FB10F = unchecked((uint)0x8C3A),
5757
Rgb9E5 = unchecked((uint)0x8C3D),
5858
Rgba32Ui = unchecked((uint)0x8D70),
@@ -84,8 +84,8 @@ public enum SizedInternalFormat : uint
8484
Rg16 = unchecked((uint)0x822C),
8585
R16F = unchecked((uint)0x822D),
8686
R32F = unchecked((uint)0x822E),
87-
RG16F = unchecked((uint)0x822F),
88-
RG32F = unchecked((uint)0x8230),
87+
Rg16F = unchecked((uint)0x822F),
88+
Rg32F = unchecked((uint)0x8230),
8989
R8I = unchecked((uint)0x8231),
9090
R8Ui = unchecked((uint)0x8232),
9191
R16I = unchecked((uint)0x8233),
@@ -255,7 +255,7 @@ public enum SizedInternalFormat : uint
255255
Rgba16FEXT = unchecked((uint)0x881A),
256256
Rgb16FEXT = unchecked((uint)0x881B),
257257
R8Ext = unchecked((uint)0x8229),
258-
Rg8Ext = unchecked((uint)0x822B),
258+
Rg8EXT = unchecked((uint)0x822B),
259259
R32FExt = unchecked((uint)0x822E),
260260
Rg32FEXT = unchecked((uint)0x8230),
261261
R16FExt = unchecked((uint)0x822D),

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ namespace Silk.NET.OpenGL;
1313
[Flags]
1414
public enum SyncObjectMask : uint
1515
{
16-
SyncFlushCommandsBit = unchecked((uint)0x00000001),
17-
SyncFlushCommandsBitApple = unchecked((uint)0x00000001),
16+
Bit = unchecked((uint)0x00000001),
17+
BitApple = unchecked((uint)0x00000001),
1818
}

‎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)