@@ -248,8 +248,6 @@ public async Task InitializeAsync(IModContext ctx, CancellationToken ct = defaul
248248 job . TypeMap . TryAdd ( "uint32_t" , "uint" ) ;
249249 job . TypeMap . TryAdd ( "int64_t" , "long" ) ;
250250 job . TypeMap . TryAdd ( "uint64_t" , "ulong" ) ;
251- job . TypeMap . TryAdd ( "GLenum" , "uint" ) ;
252- job . TypeMap . TryAdd ( "GLbitfield" , "uint" ) ;
253251 if ( specPath is null )
254252 {
255253 // No metadata, can't continue. It'd be odd if the Khronos mod is being used in this case. There was once
@@ -2155,7 +2153,7 @@ internal void ReadGroups(XDocument doc, JobData data, HashSet<string> vendors)
21552153 // Or has the "name" property.
21562154 //
21572155 // Enum member:
2158- // "group" property spcifies a list of additional OpenGL-style groups the enum member belongs to.
2156+ // The "group" property specifies a list of additional OpenGL-style groups the enum member belongs to.
21592157
21602158 // Designed to be compatible with OpenGL, EGL, WGL, GLX, and OpenCL.
21612159 // This will work for Vulkan as well, but for Vulkan the enums are actually "typedef enum"s in the headers.
@@ -2183,6 +2181,9 @@ internal void ReadGroups(XDocument doc, JobData data, HashSet<string> vendors)
21832181 : null ;
21842182 var nativeName = groupName ;
21852183
2184+ // OpenGL-style enums have an uint base type
2185+ var baseType = anyGLStyleGroups ? "uint" : null ;
2186+
21862187 // Create an ungrouped group as well i.e. GLEnum, WGLEnum, etc
21872188 if ( enumNamespace is not null )
21882189 {
@@ -2241,7 +2242,7 @@ static bool IsUngroupable(string groupName) =>
22412242 data . Groups [ groupName ] = new EnumGroup (
22422243 groupName ,
22432244 nativeName ,
2244- anyGLStyleGroups ? "GLenum" : null ,
2245+ baseType ,
22452246 [ ] ,
22462247 isBitmask ,
22472248 VendorFromString ( groupName , vendors ) ,
@@ -2307,7 +2308,7 @@ static bool IsUngroupable(string groupName) =>
23072308 : new EnumGroup (
23082309 group ,
23092310 group ,
2310- anyGLStyleGroups ? "GLenum" : null ,
2311+ baseType ,
23112312 [ ] ,
23122313 isBitmask ,
23132314 thisVendor ,
0 commit comments