Skip to content

Commit d22ced3

Browse files
authored
Fix inconsistent management of ExtSuffix in INIT macros (#453)
1 parent 860a541 commit d22ced3

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

gen/cheader.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ typedef struct WGPU{{.Name | PascalCase}}CallbackInfo{{$.ExtSuffix}} {
312312
/**
313313
* Initializer for @ref WGPU{{.Name | PascalCase}}CallbackInfo{{$.ExtSuffix}}.
314314
*/
315-
#define WGPU_{{.Name | ConstantCase}}_CALLBACK_INFO{{$.ExtSuffix}}_INIT _wgpu_MAKE_INIT_STRUCT(WGPU{{.Name | PascalCase}}CallbackInfo{{$.ExtSuffix}}, { \
315+
#define WGPU_{{.Name | ConstantCase}}_CALLBACK_INFO{{if $.ExtSuffix}}_{{$.ExtSuffix}}{{end}}_INIT _wgpu_MAKE_INIT_STRUCT(WGPU{{.Name | PascalCase}}CallbackInfo{{$.ExtSuffix}}, { \
316316
/*.nextInChain=*/NULL _wgpu_COMMA \
317317
{{- if eq .Style "callback_mode" }}
318318
/*.mode=*/WGPUCallbackMode_WaitAnyOnly _wgpu_COMMA \

gen/gen.go

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -590,11 +590,11 @@ func (g *Generator) DefaultValue(member ParameterType, isDocString bool) string
590590
return literal("NULL")
591591
} else {
592592
typ := strings.TrimPrefix(member.Type, "struct.")
593-
return ref("WGPU_" + ConstantCase(typ) + "_INIT")
593+
return ref("WGPU_" + ConstantCase(typ) + g.ConstantExtSuffix() + "_INIT")
594594
}
595595
case strings.HasPrefix(member.Type, "callback."):
596596
typ := strings.TrimPrefix(member.Type, "callback.")
597-
return ref("WGPU_" + ConstantCase(typ) + "_CALLBACK_INFO_INIT")
597+
return ref("WGPU_" + ConstantCase(typ) + "_CALLBACK_INFO" + g.ConstantExtSuffix() + "_INIT")
598598
case strings.HasPrefix(member.Type, "object."):
599599
return literal("NULL")
600600
case strings.HasPrefix(member.Type, "array<"):
@@ -607,3 +607,11 @@ func (g *Generator) DefaultValue(member ParameterType, isDocString bool) string
607607
panic("invalid prefix: " + member.Type + " in member " + member.Name)
608608
}
609609
}
610+
611+
func (g *Generator) ConstantExtSuffix() string {
612+
if g.ExtSuffix != "" {
613+
return "_" + ConstantCase(g.ExtSuffix)
614+
} else {
615+
return ""
616+
}
617+
}

0 commit comments

Comments
 (0)