fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-09 04:38:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

freedreno/registers: fix generation dependencies

Browse source 
The rules-ng.xsd is not a registers XML file, don't pass it to
gen_header.py. Instead declare rules-ng.xsd and freedreno_copyright.xml
as inputs to the gen_header.py, so that the headers are regenerated if
schema or copyright file changes.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28193>
This commit is contained in:
Dmitry Baryshkov 2024-03-15 18:29:04 +02:00 • committed by Marge Bot
parent 2ab3a5a0f7
commit bf89f777f8
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/freedreno/registers/adreno/meson.build
View file

@ -42,7 +42,7 @@ foreach f : xml_files
_name = f + '.h' _name = f + '.h'
freedreno_xml_header_files += custom_target( freedreno_xml_header_files += custom_target(
_name, _name,
input: [gen_header_py, f], input: [gen_header_py, f, freedreno_schema, freedreno_copyright],
output: _name, output: _name,
command: [prog_python, '@INPUT0@', '--rnn', rnn_src_path, '--xml', '@INPUT1@', 'c-defines'], command: [prog_python, '@INPUT0@', '--rnn', rnn_src_path, '--xml', '@INPUT1@', 'c-defines'],
capture: true, capture: true,
@ -62,7 +62,7 @@ endforeach
freedreno_xml_header_files += custom_target( freedreno_xml_header_files += custom_target(
'a6xx-pack.xml.h', 'a6xx-pack.xml.h',
input: [gen_header_py, 'a6xx.xml'], input: [gen_header_py, 'a6xx.xml', freedreno_schema, freedreno_copyright],
output: 'a6xx-pack.xml.h', output: 'a6xx-pack.xml.h',
command: [prog_python, '@INPUT0@', '--rnn', rnn_src_path, '--xml', '@INPUT1@', 'c-pack-structs'], command: [prog_python, '@INPUT0@', '--rnn', rnn_src_path, '--xml', '@INPUT1@', 'c-pack-structs'],
capture: true, capture: true,
@ -70,7 +70,7 @@ freedreno_xml_header_files += custom_target(
freedreno_xml_header_files += custom_target( freedreno_xml_header_files += custom_target(
'adreno-pm4-pack.xml.h', 'adreno-pm4-pack.xml.h',
input: [gen_header_py, 'adreno_pm4.xml'], input: [gen_header_py, 'adreno_pm4.xml', freedreno_schema, freedreno_copyright],
output: 'adreno-pm4-pack.xml.h', output: 'adreno-pm4-pack.xml.h',
command: [prog_python, '@INPUT0@', '--rnn', rnn_src_path, '--xml', '@INPUT1@', 'c-pack-structs'], command: [prog_python, '@INPUT0@', '--rnn', rnn_src_path, '--xml', '@INPUT1@', 'c-pack-structs'],
capture: true, capture: true,
@ -80,7 +80,7 @@ foreach f : xml_reg_files
_pyname = f.split('.')[0] + '.py' _pyname = f.split('.')[0] + '.py'
freedreno_py_header_files += custom_target( freedreno_py_header_files += custom_target(
_pyname, _pyname,
input: [gen_header_py, f], input: [gen_header_py, f, freedreno_schema, freedreno_copyright],
output: _pyname, output: _pyname,
command: [prog_python, '@INPUT0@', '--rnn', rnn_src_path, '--xml', '@INPUT1@', 'py-defines'], command: [prog_python, '@INPUT0@', '--rnn', rnn_src_path, '--xml', '@INPUT1@', 'py-defines'],
capture: true, capture: true,

6
src/freedreno/registers/meson.build
View file

@ -20,11 +20,11 @@
xml_files = [ xml_files = [
'adreno.xml', 'adreno.xml',
'freedreno_copyright.xml',
'rules-ng.xsd',
] ]
gen_header_py = files('gen_header.py') gen_header_py = files('gen_header.py')
freedreno_schema = files('rules-ng.xsd')
freedreno_copyright = files('freedreno_copyright.xml')
freedreno_xml_header_files = [] freedreno_xml_header_files = []
@ -32,7 +32,7 @@ foreach f : xml_files
_name = f + '.h' _name = f + '.h'
freedreno_xml_header_files += custom_target( freedreno_xml_header_files += custom_target(
_name, _name,
input: [gen_header_py, f], input: [gen_header_py, f, freedreno_schema, freedreno_copyright],
output: _name, output: _name,
command: [prog_python, '@INPUT0@', '--rnn', rnn_src_path, '--xml', '@INPUT1@', 'c-defines'], command: [prog_python, '@INPUT0@', '--rnn', rnn_src_path, '--xml', '@INPUT1@', 'c-defines'],
capture: true, capture: true,