From 8134feb9a2d7b132430d15fea16880a59c81d0a9 Mon Sep 17 00:00:00 2001
From: Jason Ekstrand <jason@jlekstrand.net>
Date: Thu, 28 Oct 2021 14:39:09 -0500
Subject: [PATCH] vulkan/meson: Re-arrange libvulkan_util deps a bit

Rename files_vulkan_runtime to vulkan_runtime_files and add a new
vulkan_runtime_deps array for dependencies.

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Acked-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13427>
---
 src/vulkan/runtime/meson.build | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/vulkan/runtime/meson.build b/src/vulkan/runtime/meson.build
index 0a21bfb15a4..f5baa2a2e50 100644
--- a/src/vulkan/runtime/meson.build
+++ b/src/vulkan/runtime/meson.build
@@ -23,7 +23,7 @@
 vk_physical_device_features_gen_depend_files = [
 ]
 
-files_vulkan_runtime = files(
+vulkan_runtime_files = files(
   'vk_cmd_copy.c',
   'vk_command_buffer.c',
   'vk_command_buffer.h',
@@ -57,6 +57,13 @@ files_vulkan_runtime = files(
   'vk_synchronization2.c',
 )
 
+vulkan_runtime_deps = [
+  vulkan_wsi_deps,
+  idep_mesautil,
+  idep_nir_headers,
+  idep_vulkan_util,
+]
+
 vk_common_entrypoints = custom_target(
   'vk_common_entrypoints',
   input : [vk_entrypoints_gen, vk_api_xml],
@@ -103,11 +110,10 @@ vk_physical_device_features = custom_target(
 
 libvulkan_runtime = static_library(
   'vulkan_runtime',
-  [files_vulkan_runtime, vk_common_entrypoints, vk_cmd_queue,
+  [vulkan_runtime_files, vk_common_entrypoints, vk_cmd_queue,
    vk_dispatch_trampolines, vk_physical_device_features],
   include_directories : [inc_include, inc_src, inc_gallium],
-  dependencies : [vulkan_wsi_deps, idep_mesautil, idep_nir_headers,
-                  idep_vulkan_util],
+  dependencies : vulkan_runtime_deps,
   # For glsl_type_singleton
   link_with : libcompiler,
   c_args : [vulkan_wsi_args],