bitflag extensions

Author: rajveermalviya

gen/cheader.tmpl

@@ -84,7 +84,7 @@ struct WGPU{{.Name | PascalCase}};
 {{- range $enum := .Enums}}
 {{-   if .Extended}}
 {{-     range $entryIndex, $_ := .Entries}}
-__WGPU_EXTEND_ENUM(WGPU{{ $enum.Name | PascalCase }}, WGPU{{ $enum.Name | PascalCase}}_{{.Name | PascalCase}}, {{EnumValue $.EnumPrefix $enum $entryIndex}});
+__WGPU_EXTEND_ENUM(WGPU{{$enum.Name | PascalCase}}, WGPU{{$enum.Name | PascalCase}}_{{.Name | PascalCase}}, {{EnumValue $.EnumPrefix $enum $entryIndex}});
 {{-     end}}
 {{-   else}}
 {{-     MComment .Doc 0}}
@@ -99,15 +99,21 @@ typedef enum WGPU{{.Name | PascalCase}} {
 {{  end}}
 
 {{- range $bitflag := .Bitflags}}
-{{-   MComment .Doc 0}}
+{{-   if .Extended}}
+{{-     range $entryIndex, $_ := .Entries}}
+__WGPU_EXTEND_ENUM(WGPU{{$bitflag.Name | PascalCase}}, WGPU{{$bitflag.Name | PascalCase}}_{{.Name | PascalCase}}, {{BitflagValue $bitflag $entryIndex}});
+{{-     end}}
+{{-   else}}
+{{-     MComment .Doc 0}}
 typedef enum WGPU{{.Name | PascalCase}} {
-{{-   range $entryIndex, $_ := .Entries}}
-{{-     MComment .Doc 4}}
+{{-     range $entryIndex, $_ := .Entries}}
+{{-       MComment .Doc 4}}
     WGPU{{$bitflag.Name | PascalCase}}_{{.Name | PascalCase}} = {{BitflagValue $bitflag $entryIndex}},
-{{-   end}}
+{{-     end}}
     WGPU{{$bitflag.Name | PascalCase}}_Force32 = 0x7FFFFFFF
 } WGPU{{$bitflag.Name | PascalCase}} WGPU_ENUM_ATTRIBUTE;
 typedef WGPUFlags WGPU{{$bitflag.Name | PascalCase}}Flags WGPU_ENUM_ATTRIBUTE;
+{{-   end}}
 {{  end}}
 
 {{- if eq .Name "webgpu"}}

gen/main.go

@@ -98,6 +98,12 @@ func SortAndTransform(yml *Yml) {
 
 	// Sort bitflags
 	slices.SortStableFunc(yml.Bitflags, func(a, b Bitflag) int {
+		// We want to generate extended bitflag declarations before the normal ones.
+		if a.Extended && !b.Extended {
+			return -1
+		} else if !a.Extended && b.Extended {
+			return 1
+		}
 		return strings.Compare(PascalCase(a.Name), PascalCase(b.Name))
 	})
 

gen/validator.go

@@ -89,6 +89,9 @@ func mergeAndValidateDuplicates(yamlPaths []string) (errs error) {
 					if slices.ContainsFunc(prevBf.Entries, func(e BitflagEntry) bool { return e.Name == entry.Name }) {
 						errs = errors.Join(errs, fmt.Errorf("merge: bitflags.%s.%s in %s was already found previously while parsing, duplicates are not allowed", bf.Name, entry.Name, yamlPath))
 					}
+					if entry.Value == "" && len(entry.ValueCombination) == 0 {
+						errs = errors.Join(errs, fmt.Errorf("merge: bitflags.%s.%s in %s was extended but doesn't have a value or value_combination, extended bitflag entries must have an explicit value", bf.Name, entry.Name, yamlPath))
+					}
 					prevBf.Entries = append(prevBf.Entries, entry)
 				}
 				bitflags[bf.Name] = prevBf