From 6e1373861c5fc5838d7e287d1321c04d9959f88b Mon Sep 17 00:00:00 2001 From: Daniel Svensson Date: Thu, 26 Sep 2024 21:44:54 +0200 Subject: [PATCH] zink: add spirv_info_h dep to libzink. Build dependency of zink_compiler.c. Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/11926 Fixes: a09c5d55ed7 ("spirv: Auto-generate spirv_info.h") Part-of: (cherry picked from commit 55e1a596f6c5f89dc2cef5708c50ece0b025218d) --- .pick_status.json | 2 +- src/gallium/drivers/zink/meson.build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 7e1fb16c180..cbc3ffe250c 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -454,7 +454,7 @@ "description": "zink: add spirv_info_h dep to libzink.", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "a09c5d55ed7481a9ec61cec956538b8759212c98", "notes": null diff --git a/src/gallium/drivers/zink/meson.build b/src/gallium/drivers/zink/meson.build index ab9d3200bea..ef09e6735c4 100644 --- a/src/gallium/drivers/zink/meson.build +++ b/src/gallium/drivers/zink/meson.build @@ -90,7 +90,7 @@ endif libzink = static_library( 'zink', - [files_libzink, zink_device_info, zink_instance, zink_nir_algebraic_c, vk_dispatch_table], + [files_libzink, zink_device_info, zink_instance, zink_nir_algebraic_c, vk_dispatch_table, spirv_info_h], gnu_symbol_visibility : 'hidden', include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_vulkan_util, inc_zink_vk], link_args : [ld_args_build_id],