anv+tu+radv: delete unusable dev_icd.json

[mesa.git] / src / freedreno / vulkan / meson.build

diff --git a/src/freedreno/vulkan/meson.build b/src/freedreno/vulkan/meson.build
index a9380509afcc539b890e7efd3e8a08228630532d..b14a4e709526244fba3b8b9ade81a697f025125a 100644 (file)
--- a/src/freedreno/vulkan/meson.build
+++ b/src/freedreno/vulkan/meson.build
@@ -39,8 +39,8 @@ tu_extensions_c = custom_target(
   ],
 )
 
-vk_format_table_c = custom_target(
-  'vk_format_table.c',
+tu_format_table_c = custom_target(
+  'tu_format_table.c',
   input : ['vk_format_table.py', 'vk_format_layout.csv'],
   output : 'vk_format_table.c',
   command : [prog_python, '@INPUT@'],
@@ -50,9 +50,12 @@ vk_format_table_c = custom_target(
 
 libtu_files = files(
   'tu_cmd_buffer.c',
+  'tu_cs.c',
   'tu_device.c',
   'tu_descriptor_set.c',
   'tu_descriptor_set.h',
+  'tu_drm.c',
+  'tu_fence.c',
   'tu_formats.c',
   'tu_image.c',
   'tu_meta_blit.c',
@@ -65,27 +68,36 @@ libtu_files = files(
   'tu_pipeline_cache.c',
   'tu_private.h',
   'tu_query.c',
+  'tu_shader.c',
   'tu_util.c',
   'tu_util.h',
+  'tu_wsi.c',
   'vk_format.h',
 )
 
 tu_deps = []
 tu_flags = []
 
+if with_platform_wayland
+  tu_deps += dep_wayland_client
+  tu_flags += '-DVK_USE_PLATFORM_WAYLAND_KHR'
+  libtu_files += files('tu_wsi_wayland.c')
+endif
+
 libvulkan_freedreno = shared_library(
   'vulkan_freedreno',
-  [libtu_files, tu_entrypoints, tu_extensions_c, vk_format_table_c],
+  [libtu_files, tu_entrypoints, tu_extensions_c, tu_format_table_c, freedreno_xml_header_files],
   include_directories : [
     inc_common,
     inc_compiler,
-    inc_vulkan_util,
+    inc_vulkan_wsi,
     inc_freedreno,
   ],
   link_with : [
-    libfreedreno_drm,
-    libvulkan_util,
+    libvulkan_wsi,
     libmesa_util,
+    libfreedreno_drm, # required by ir3_shader_get_variant, which we don't use
+    libfreedreno_ir3,
   ],
   dependencies : [
     dep_dl,
@@ -96,12 +108,27 @@ libvulkan_freedreno = shared_library(
     dep_thread,
     dep_valgrind,
     idep_nir,
+    tu_deps,
+    idep_vulkan_util,
   ],
   c_args : [c_vis_args, no_override_init_args, tu_flags],
   link_args : [ld_args_bsymbolic, ld_args_gc_sections],
   install : true,
 )
 
+if with_tests and prog_nm.found()
+  test(
+    'tu symbols check',
+    symbols_check,
+    args : [
+      '--lib', libvulkan_freedreno,
+      '--symbols-file', vulkan_icd_symbols,
+      '--nm', prog_nm.path(),
+    ],
+    suite : ['freedreno'],
+  )
+endif
+
 freedreno_icd = custom_target(
   'freedreno_icd',
   input : 'tu_icd.py',
@@ -116,16 +143,3 @@ freedreno_icd = custom_target(
   install_dir : with_vulkan_icd_dir,
   install : true,
 )
-
-tu_dev_icd = custom_target(
-  'tu_dev_icd',
-  input : 'tu_icd.py',
-  output : 'dev_icd.json',
-  command : [
-    prog_python, '@INPUT@', '--lib-path', meson.current_build_dir(),
-    '--out', '@OUTPUT@'
-  ],
-  depend_files : files('tu_extensions.py'),
-  build_by_default : true,
-  install : false,
-)