diff --git a/scripts/cgenerator.py b/scripts/cgenerator.py index 491d12998..82aa7ac1b 100644 --- a/scripts/cgenerator.py +++ b/scripts/cgenerator.py @@ -41,6 +41,7 @@ def __init__(self, aliasMacro='', misracstyle=False, misracppstyle=False, + indentClosingBrace=False, **kwargs ): """Constructor. @@ -165,6 +166,8 @@ def __init__(self, self.misracppstyle = misracppstyle """generate MISRA C++-friendly headers""" + self.indentClosingBrace = indentClosingBrace + self.codeGenerator = True """True if this generator makes compilable code""" diff --git a/scripts/generator.py b/scripts/generator.py index 5d2eb3535..38438ad5e 100644 --- a/scripts/generator.py +++ b/scripts/generator.py @@ -192,6 +192,7 @@ def __init__(self, sortProcedure=regSortFeatures, requireCommandAliases=False, requireDepends=True, + indentClosingBrace=False, ): """Constructor. @@ -333,6 +334,8 @@ def __init__(self, self.requireDepends = requireDepends """True if dependencies of API tags are transitively required.""" + self.indentClosingBrace = indentClosingBrace + def emptyRegex(self, pat): """Substitute a regular expression which matches no version or extension names for None or the empty string.""" @@ -1430,7 +1433,10 @@ def makeCDecls(self, cmd): indentdecl = '(\n' indentdecl += ',\n'.join(self.makeCParamDecl(p, self.genOpts.alignFuncParam) for p in params) - indentdecl += ');' + if self.genOpts.indentClosingBrace: + indentdecl += '\n);' + else: + indentdecl += ');' else: indentdecl = '(void);' # Non-indented parameters diff --git a/scripts/genvk.py b/scripts/genvk.py index 9eef4b775..54cf30b86 100755 --- a/scripts/genvk.py +++ b/scripts/genvk.py @@ -584,7 +584,8 @@ def makeGenOpts(args): apientryp = 'VKAPI_PTR *', alignFuncParam = 48, misracstyle = misracstyle, - misracppstyle = misracppstyle) + misracppstyle = misracppstyle, + indentClosingBrace = False) ] genOpts['vulkan_base_core.h'] = [