From bd63d1e6260ecb2929a0db4c841cb3dc7b828df8 Mon Sep 17 00:00:00 2001 From: Boris Brezillon Date: Thu, 8 Feb 2024 14:55:55 +0100 Subject: [PATCH] pan/va: Add missing valhall_enums dep to valhall_disasm valhall_disasm compilation fails if the valhall_enums.h has not be generated. Fixes: 619566dea18e ("pan/va: Generate header containing enums") Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/10553 Signed-off-by: Boris Brezillon Reviewed-by: Dylan Baker Part-of: (cherry picked from commit 49069a1243de8de3f658faa5fd8bb71d31c7d907) --- .pick_status.json | 2 +- src/panfrost/compiler/valhall/meson.build | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index 71ca7c6b05c..68518f06bd4 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -2564,7 +2564,7 @@ "description": "pan/va: Add missing valhall_enums dep to valhall_disasm", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "619566dea18e94e0c1e00effc8200df75b892941", "notes": null diff --git a/src/panfrost/compiler/valhall/meson.build b/src/panfrost/compiler/valhall/meson.build index b3e54197b05..7712b6ab1d6 100644 --- a/src/panfrost/compiler/valhall/meson.build +++ b/src/panfrost/compiler/valhall/meson.build @@ -69,6 +69,7 @@ if with_tests c_args : [c_msvc_compat_args, no_override_init_args], gnu_symbol_visibility : 'hidden', include_directories : [inc_include, inc_src, inc_mesa], + dependencies: [idep_valhall_enums_h], link_with : [libpanfrost_valhall_disasm], ), suite : ['panfrost'],