spirv: add missing build dependency
authorEric Engestrom <eric@igalia.com>
Sun, 10 Dec 2023 16:35:53 +0000 (16:35 +0000)
committerEric Engestrom <eric@engestrom.ch>
Tue, 12 Dec 2023 10:00:12 +0000 (10:00 +0000)
Fixes: 59a72570b66ad7c4fd95 ("compiler: Move spirv into a module of its own")
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/10277
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26624>
(cherry picked from commit c51e40dd8b031fb43993e3e6413c035f81ab1afa)

.pick_status.json
src/compiler/spirv/meson.build

index 1250e63..872876f 100644 (file)
         "description": "spirv: add missing build dependency",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "59a72570b66ad7c4fd953e18e18a9b09b1a7ae7e",
         "notes": null
index dfb53d6..b1c5b1f 100644 (file)
@@ -81,7 +81,9 @@ idep_vtn = declare_dependency(
 
 spirv2nir = executable(
   'spirv2nir',
-  files('spirv2nir.c'),
+  files('spirv2nir.c') + [
+   vtn_generator_ids_h,
+  ],
   dependencies : [dep_m, idep_vtn, idep_mesautil],
   include_directories : [inc_include, inc_src, inc_mapi, inc_mesa],
   c_args : [c_msvc_compat_args, no_override_init_args],