Module: Mesa Branch: staging/23.3 Commit: da30685af9121ed2a91f0b854cf0975e581769cc URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=da30685af9121ed2a91f0b854cf0975e581769cc
Author: Eric Engestrom <[email protected]> Date: Sun Dec 10 16:35:53 2023 +0000 spirv: add missing build dependency 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 | 2 +- src/compiler/spirv/meson.build | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 1250e634226..872876fd6c2 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -264,7 +264,7 @@ "description": "spirv: add missing build dependency", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "59a72570b66ad7c4fd953e18e18a9b09b1a7ae7e", "notes": null diff --git a/src/compiler/spirv/meson.build b/src/compiler/spirv/meson.build index dfb53d6738c..b1c5b1f16e6 100644 --- a/src/compiler/spirv/meson.build +++ b/src/compiler/spirv/meson.build @@ -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],
