mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2025-12-30 07:50:11 +01:00
nouveau: Use hyphenated arguments to class_parser.py
This is more consistent with other code generators in Mesa. Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27397>
This commit is contained in:
parent
0d2008461d
commit
53bc795616
2 changed files with 12 additions and 7 deletions
|
|
@ -252,6 +252,7 @@ def parse_header(nvcl, f):
|
|||
# state 2 looking for enums for a fields in a method
|
||||
# blank lines reset the state machine to 0
|
||||
|
||||
version = None
|
||||
state = 0
|
||||
mthddict = {}
|
||||
curmthd = {}
|
||||
|
|
@ -271,6 +272,9 @@ def parse_header(nvcl, f):
|
|||
continue
|
||||
|
||||
if not list[1].startswith(nvcl):
|
||||
if len(list) > 2 and list[2].startswith("0x"):
|
||||
assert version is None
|
||||
version = (list[1], list[2])
|
||||
continue
|
||||
|
||||
if list[1].endswith("TYPEDEF"):
|
||||
|
|
@ -331,13 +335,13 @@ def parse_header(nvcl, f):
|
|||
curmthd = x
|
||||
state = 1
|
||||
|
||||
return mthddict
|
||||
return (version, mthddict)
|
||||
|
||||
def main():
|
||||
parser = argparse.ArgumentParser()
|
||||
parser.add_argument('--out_h', required=True, help='Output C header.')
|
||||
parser.add_argument('--out_c', required=True, help='Output C file.')
|
||||
parser.add_argument('--in_h',
|
||||
parser.add_argument('--out-h', required=True, help='Output C header.')
|
||||
parser.add_argument('--out-c', required=True, help='Output C file.')
|
||||
parser.add_argument('--in-h',
|
||||
help='Input class header file.',
|
||||
required=True)
|
||||
args = parser.parse_args()
|
||||
|
|
@ -350,12 +354,13 @@ def main():
|
|||
nvcl = "NV" + nvcl
|
||||
|
||||
with open(args.in_h, 'r', encoding='utf-8') as f:
|
||||
mthddict = parse_header(nvcl, f)
|
||||
(version, mthddict) = parse_header(nvcl, f)
|
||||
|
||||
environment = {
|
||||
'clheader': clheader,
|
||||
'header': os.path.basename(args.out_h),
|
||||
'nvcl': nvcl,
|
||||
'version': version,
|
||||
'mthddict': mthddict,
|
||||
'bs': '\\'
|
||||
}
|
||||
|
|
|
|||
|
|
@ -34,8 +34,8 @@ foreach cl : nvk_classes
|
|||
cl + '.h',
|
||||
input : ['class_parser.py', 'nvidia/classes/'+cl+'.h'],
|
||||
output : ['nvk_'+cl+'.h', 'nvk_'+cl+'.c'],
|
||||
command : [prog_python, '@INPUT0@', '--in_h', '@INPUT1@',
|
||||
'--out_h', '@OUTPUT0@', '--out_c', '@OUTPUT1@'],
|
||||
command : [prog_python, '@INPUT0@', '--in-h', '@INPUT1@',
|
||||
'--out-h', '@OUTPUT0@', '--out-c', '@OUTPUT1@'],
|
||||
depend_files: nvk_cl_header_depend_files,
|
||||
)
|
||||
endforeach
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue