From bf89f777f8d73b0ccace07e5c27a12f19fd412ba Mon Sep 17 00:00:00 2001
From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Date: Fri, 15 Mar 2024 18:29:04 +0200
Subject: [PATCH] freedreno/registers: fix generation dependencies

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>
---
 src/freedreno/registers/adreno/meson.build | 8 ++++----
 src/freedreno/registers/meson.build        | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/freedreno/registers/adreno/meson.build b/src/freedreno/registers/adreno/meson.build
index d188dc6596a..c594da5c057 100644
--- a/src/freedreno/registers/adreno/meson.build
+++ b/src/freedreno/registers/adreno/meson.build
@@ -42,7 +42,7 @@ foreach f : xml_files
   _name = f + '.h'
   freedreno_xml_header_files += custom_target(
     _name,
-    input: [gen_header_py, f],
+    input: [gen_header_py, f, freedreno_schema, freedreno_copyright],
     output: _name,
     command: [prog_python, '@INPUT0@', '--rnn', rnn_src_path, '--xml', '@INPUT1@', 'c-defines'],
     capture: true,
@@ -62,7 +62,7 @@ endforeach
 
 freedreno_xml_header_files += custom_target(
     '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',
     command: [prog_python, '@INPUT0@', '--rnn', rnn_src_path, '--xml', '@INPUT1@', 'c-pack-structs'],
     capture: true,
@@ -70,7 +70,7 @@ freedreno_xml_header_files += custom_target(
 
 freedreno_xml_header_files += custom_target(
     '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',
     command: [prog_python, '@INPUT0@', '--rnn', rnn_src_path, '--xml', '@INPUT1@', 'c-pack-structs'],
     capture: true,
@@ -80,7 +80,7 @@ foreach f : xml_reg_files
   _pyname = f.split('.')[0] + '.py'
   freedreno_py_header_files += custom_target(
     _pyname,
-    input: [gen_header_py, f],
+    input: [gen_header_py, f, freedreno_schema, freedreno_copyright],
     output: _pyname,
     command: [prog_python, '@INPUT0@', '--rnn', rnn_src_path, '--xml', '@INPUT1@', 'py-defines'],
     capture: true,
diff --git a/src/freedreno/registers/meson.build b/src/freedreno/registers/meson.build
index ae187041572..b2746b70ee4 100644
--- a/src/freedreno/registers/meson.build
+++ b/src/freedreno/registers/meson.build
@@ -20,11 +20,11 @@
 
 xml_files = [
   'adreno.xml',
-  'freedreno_copyright.xml',
-  'rules-ng.xsd',
 ]
 
 gen_header_py = files('gen_header.py')
+freedreno_schema = files('rules-ng.xsd')
+freedreno_copyright = files('freedreno_copyright.xml')
 
 freedreno_xml_header_files = []
 
@@ -32,7 +32,7 @@ foreach f : xml_files
   _name = f + '.h'
   freedreno_xml_header_files += custom_target(
     _name,
-    input: [gen_header_py, f],
+    input: [gen_header_py, f, freedreno_schema, freedreno_copyright],
     output: _name,
     command: [prog_python, '@INPUT0@', '--rnn', rnn_src_path, '--xml', '@INPUT1@', 'c-defines'],
     capture: true,