meson: add various generated header dependencies as order-only deps

https://mesonbuild.com/FAQ.html#how-do-i-tell-meson-that-my-sources-use-generated-headers

A few locations had underspecified deps on the header files, and this
caused builds to fail given sufficient parallelism.

Fixes #6531

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16659>

diff --git a/src/broadcom/vulkan/meson.build b/src/broadcom/vulkan/meson.build
index ab1b98a..c8f791f 100644 (file)
--- a/src/broadcom/vulkan/meson.build
+++ b/src/broadcom/vulkan/meson.build
@@ -51,7 +51,7 @@ libv3dv_files = files(
   'v3dv_queue.c',
   'v3dv_uniforms.c',
   'v3dv_wsi.c',
-)
+) + [v3d_xml_pack, vk_common_entrypoints[0], wsi_entrypoints[0]]
 
 files_per_version = files(
   'v3dvx_cmd_buffer.c',

diff --git a/src/freedreno/vulkan/meson.build b/src/freedreno/vulkan/meson.build
index b799d23..0d7d3f5 100644 (file)
--- a/src/freedreno/vulkan/meson.build
+++ b/src/freedreno/vulkan/meson.build
@@ -119,7 +119,7 @@ endif
 
 libvulkan_freedreno = shared_library(
   'vulkan_freedreno',
-  [libtu_files, tu_entrypoints, tu_tracepoints, freedreno_xml_header_files, sha1_h],
+  [libtu_files, tu_entrypoints, tu_tracepoints, freedreno_xml_header_files, sha1_h, u_format_pack_h],
   include_directories : [
     inc_include,
     inc_src,

diff --git a/src/gallium/frontends/lavapipe/meson.build b/src/gallium/frontends/lavapipe/meson.build
index 85ff200..8215cf0 100644 (file)
--- a/src/gallium/frontends/lavapipe/meson.build
+++ b/src/gallium/frontends/lavapipe/meson.build
@@ -26,7 +26,7 @@ liblvp_files = files(
     'lvp_pipeline.c',
     'lvp_pipeline_cache.c',
     'lvp_query.c',
-    'lvp_wsi.c')
+    'lvp_wsi.c') + [vk_cmd_enqueue_entrypoints[0]]
 
 lvp_deps = []
 lvp_flags = []

diff --git a/src/panfrost/vulkan/meson.build b/src/panfrost/vulkan/meson.build
index cea763e..da6729d 100644 (file)
--- a/src/panfrost/vulkan/meson.build
+++ b/src/panfrost/vulkan/meson.build
@@ -49,7 +49,7 @@ libpanvk_files = files(
   'panvk_shader.c',
   'panvk_util.c',
   'panvk_wsi.c',
-)
+) + [vk_cmd_enqueue_entrypoints[0], vk_common_entrypoints[0]]
 
 panvk_deps = []
 panvk_flags = []

diff --git a/src/virtio/vulkan/meson.build b/src/virtio/vulkan/meson.build
index 346c4da..73461cc 100644 (file)
--- a/src/virtio/vulkan/meson.build
+++ b/src/virtio/vulkan/meson.build
@@ -90,6 +90,7 @@ vn_libs = []
 
 if with_platform_wayland or with_platform_x11
   libvn_files += files('vn_wsi.c')
+  libvn_files += wsi_entrypoints[0]
   vn_flags += '-DVN_USE_WSI_PLATFORM'
 endif