Mesa (staging/21.2): iris, crocus: add idep_genxml to per_hw target dependencies

[GitLab Mirror]

Module: Mesa
Branch: staging/21.2
Commit: 101427245222c1785a872a800e644199e35b9fa5
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=101427245222c1785a872a800e644199e35b9fa5

Author: Chia-I Wu <olvaffe at gmail.com>
Date:   Fri Jul 30 14:55:22 2021 -0700

iris, crocus: add idep_genxml to per_hw target dependencies

Fixes

  In file included from ../src/gallium/drivers/iris/iris_query.c:49:
  ../src/gallium/drivers/iris/iris_genx_macros.h:81:10: fatal error: genxml/genX_bits.h: No such file or directory

and

  In file included from ../src/gallium/drivers/crocus/crocus_query.c:50:
  ../src/gallium/drivers/crocus/crocus_genx_macros.h:86:10: fatal error: genxml/genX_bits.h: No such file or directory

Signed-off-by: Chia-I Wu <olvaffe at gmail.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12149>
(cherry picked from commit b4214adefc3ab5eb5e6bc456413cb2449d98a444)

---

 .pick_status.json                      | 2 +-
 src/gallium/drivers/crocus/meson.build | 2 +-
 src/gallium/drivers/iris/meson.build   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 7fc9897d95a..7c7c9db1438 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -850,7 +850,7 @@
         "description": "iris, crocus: add idep_genxml to per_hw target dependencies",
         "nominated": false,
         "nomination_type": null,
-        "resolution": 4,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null
     },
diff --git a/src/gallium/drivers/crocus/meson.build b/src/gallium/drivers/crocus/meson.build
index a6bc5830afd..86e713c94f7 100644
--- a/src/gallium/drivers/crocus/meson.build
+++ b/src/gallium/drivers/crocus/meson.build
@@ -61,7 +61,7 @@ foreach v : ['40', '45', '50', '60', '70', '75', '80']
       '-DGFX_VERx10=@0@'.format(v),
     ],
     gnu_symbol_visibility : 'hidden',
-    dependencies : [dep_libdrm, dep_valgrind, idep_nir_headers],
+    dependencies : [dep_libdrm, dep_valgrind, idep_genxml, idep_nir_headers],
   )
 endforeach
 
diff --git a/src/gallium/drivers/iris/meson.build b/src/gallium/drivers/iris/meson.build
index c292f884e47..1c5905805ea 100644
--- a/src/gallium/drivers/iris/meson.build
+++ b/src/gallium/drivers/iris/meson.build
@@ -68,7 +68,7 @@ foreach v : ['80', '90', '110', '120', '125']
       '-DGFX_VERx10=@0@'.format(v),
     ],
     gnu_symbol_visibility : 'hidden',
-    dependencies : [dep_libdrm, dep_valgrind, idep_nir_headers],
+    dependencies : [dep_libdrm, dep_valgrind, idep_genxml, idep_nir_headers],
   )
 endforeach