Import Mesa 19.2.8

1 files changed, 6 insertions, 7 deletions

diff --git a/lib/mesa/src/vulkan/util/meson.build b/lib/mesa/src/vulkan/util/meson.build
index e869056ac..9153878ea 100644
--- a/lib/mesa/src/vulkan/util/meson.build
+++ b/lib/mesa/src/vulkan/util/meson.build
@@ -28,19 +28,20 @@ files_vulkan_util = files(
 
 vk_enum_to_str = custom_target(
   'vk_enum_to_str',
-  input : ['gen_enum_to_str.py', vk_api_xml[0]],
+  input : ['gen_enum_to_str.py', vk_api_xml],
   output : ['vk_enum_to_str.c', 'vk_enum_to_str.h'],
   command : [
-    prog_python, '@INPUT0@', '--xml', '@INPUT1@', '--outdir',
-    meson.current_build_dir()
+    prog_python, '@INPUT0@', '--xml', '@INPUT1@',
+    '--outdir', meson.current_build_dir()
   ],
 )
 
 libvulkan_util = static_library(
   'vulkan_util',
   [files_vulkan_util, vk_enum_to_str],
-  include_directories : [inc_common, inc_vulkan],
-  c_args : [c_vis_args],
+  include_directories : inc_common,
+  dependencies : vulkan_wsi_deps,
+  c_args : [c_vis_args, vulkan_wsi_args],
   build_by_default : false,
 )
 
@@ -50,8 +51,6 @@ idep_vulkan_util_headers = declare_dependency(
 )
 
 idep_vulkan_util = declare_dependency(
-  sources : vk_enum_to_str[1],
   link_with : libvulkan_util,
-  include_directories : include_directories('.'),
   dependencies : idep_vulkan_util_headers
 )