vulkan: Compute path to write into JSON manifests once, use it everywhere

This reduces duplication: we only need to distinguish between Windows
and Unix in one place.

The previous code was inconsistent about using either the `platforms`
option, or the `host_machine`. Following the logic described in
commit 94379377 "lavapipe: build "Windows" check should use the host machine, not the `platforms` option.",
I've assumed that checking the host machine is the more-correct version
and used that.

Signed-off-by: Simon McVittie <smcv@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/37576>

meson.build

@@ -2273,6 +2273,12 @@ devenv = environment()
 dir_compiler_nir = join_paths(meson.current_source_dir(), 'src/compiler/nir/')
 dir_source_root = meson.project_source_root()
 
+if host_machine.system() == 'windows'
+  vulkan_icd_lib_path = import('fs').relative_to(get_option('bindir'), with_vulkan_icd_dir)
+else
+  vulkan_icd_lib_path = get_option('prefix') / get_option('libdir')
+endif
+
 
 subdir('include')
 subdir('bin')

src/amd/vulkan/meson.build

@@ -281,17 +281,13 @@ if with_symbols_check
   )
 endif
 
-icd_lib_path = join_paths(get_option('prefix'), get_option('libdir'))
 icd_file_name = libname_prefix + 'vulkan_radeon.' + libname_suffix
-if with_platform_windows
-  icd_lib_path = import('fs').relative_to(get_option('bindir'), with_vulkan_icd_dir)
-endif
 
 icd_command = [
   prog_python, '@INPUT0@',
   '--api-version', '1.4', '--xml', '@INPUT1@',
   '--sizeof-pointer', sizeof_pointer,
-  '--lib-path', join_paths(icd_lib_path, icd_file_name),
+  '--lib-path', vulkan_icd_lib_path / icd_file_name,
   '--out', '@OUTPUT@',
 ]
 if with_platform_windows

src/asahi/vulkan/meson.build

@@ -102,11 +102,7 @@ libvulkan_asahi = shared_library(
   install : true,
 )
 
-icd_lib_path = join_paths(get_option('prefix'), get_option('libdir'))
 icd_file_name = libname_prefix + 'vulkan_asahi.' + libname_suffix
-if with_platform_windows
-  icd_lib_path = import('fs').relative_to(get_option('bindir'), with_vulkan_icd_dir)
-endif
 
 asahi_icd = custom_target(
   input : [vk_icd_gen, vk_api_xml],
@@ -115,7 +111,7 @@ asahi_icd = custom_target(
     prog_python, '@INPUT0@',
     '--api-version', '1.4', '--xml', '@INPUT1@',
     '--sizeof-pointer', sizeof_pointer,
-    '--lib-path', join_paths(icd_lib_path, icd_file_name),
+    '--lib-path', vulkan_icd_lib_path / icd_file_name,
     '--out', '@OUTPUT@',
   ],
   build_by_default : true,

src/broadcom/vulkan/meson.build

@@ -132,8 +132,7 @@ broadcom_icd = custom_target(
     prog_python, '@INPUT0@',
     '--api-version', '1.3', '--xml', '@INPUT1@',
     '--sizeof-pointer', sizeof_pointer,
-    '--lib-path', join_paths(get_option('prefix'), get_option('libdir'),
-                             icd_file_name),
+    '--lib-path', vulkan_icd_lib_path / icd_file_name,
     '--out', '@OUTPUT@',
   ],
   build_by_default : true,

src/freedreno/vulkan/meson.build

@@ -207,8 +207,7 @@ freedreno_icd = custom_target(
     prog_python, '@INPUT0@',
     '--api-version', '1.4', '--xml', '@INPUT1@',
     '--sizeof-pointer', sizeof_pointer,
-    '--lib-path', join_paths(get_option('prefix'), get_option('libdir'),
-                             icd_file_name),
+    '--lib-path', vulkan_icd_lib_path / icd_file_name,
     '--out', '@OUTPUT@',
   ],
   build_by_default : true,

src/gallium/targets/lavapipe/meson.build

@@ -20,17 +20,11 @@ libvulkan_lvp = shared_library(
 
 icd_file_name = libname_prefix + 'vulkan_lvp.' + libname_suffix
 
-if host_machine.system() == 'windows'
-  icd_lib_path = import('fs').relative_to(get_option('bindir'), with_vulkan_icd_dir)
-else
-  icd_lib_path = join_paths(get_option('prefix'), get_option('libdir'))
-endif
-
 icd_command = [
   prog_python, '@INPUT0@',
   '--api-version', '1.4', '--xml', '@INPUT1@',
   '--sizeof-pointer', sizeof_pointer,
-  '--lib-path', join_paths(icd_lib_path, icd_file_name),
+  '--lib-path', vulkan_icd_lib_path / icd_file_name,
   '--out', '@OUTPUT@',
 ]
 if host_machine.system() == 'windows'

src/gfxstream/guest/vulkan/meson.build

@@ -48,8 +48,7 @@ gfxstream_icd = custom_target(
     prog_python, '@INPUT0@',
     '--api-version', '1.1', '--xml', '@INPUT1@',
     '--sizeof-pointer', sizeof_pointer,
-    '--lib-path', join_paths(get_option('prefix'), get_option('libdir'),
-                             icd_file_name),
+    '--lib-path', vulkan_icd_lib_path / icd_file_name,
     '--out', '@OUTPUT@',
   ],
   build_by_default : true,

src/imagination/vulkan/meson.build

@@ -146,7 +146,7 @@ powervr_mesa_icd = custom_target(
     prog_python, '@INPUT0@',
     '--api-version', '1.4', '--xml', '@INPUT1@',
     '--sizeof-pointer', sizeof_pointer,
-    '--lib-path', get_option('prefix') / get_option('libdir') / icd_file_name,
+    '--lib-path', vulkan_icd_lib_path / icd_file_name,
     '--out', '@OUTPUT@',
   ],
   build_by_default : true,

src/intel/vulkan/meson.build

@@ -55,8 +55,7 @@ intel_icd = custom_target(
     prog_python, '@INPUT0@',
     '--api-version', '1.4', '--xml', '@INPUT1@',
     '--sizeof-pointer', sizeof_pointer,
-    '--lib-path', join_paths(get_option('prefix'), get_option('libdir'),
-                             icd_file_name),
+    '--lib-path', vulkan_icd_lib_path / icd_file_name,
     '--out', '@OUTPUT@',
   ],
   build_by_default : true,

src/intel/vulkan_hasvk/meson.build

@@ -26,8 +26,7 @@ intel_hasvk_icd = custom_target(
     prog_python, '@INPUT0@',
     '--api-version', '1.3', '--xml', '@INPUT1@',
     '--sizeof-pointer', sizeof_pointer,
-    '--lib-path', join_paths(get_option('prefix'), get_option('libdir'),
-                             icd_file_name),
+    '--lib-path', vulkan_icd_lib_path / icd_file_name,
     '--out', '@OUTPUT@',
   ],
   build_by_default : true,

src/microsoft/vulkan/meson.build

@@ -74,17 +74,13 @@ libvulkan_dzn = shared_library(
 )
 
 icd_file_name = libname_prefix + 'vulkan_dzn.' + libname_suffix
-icd_lib_path = join_paths(get_option('prefix'), get_option('libdir'))
-if with_platform_windows
-  icd_lib_path = import('fs').relative_to(get_option('bindir'), with_vulkan_icd_dir)
-endif
 
 
 icd_command = [
    prog_python, '@INPUT0@',
    '--api-version', '1.1', '--xml', '@INPUT1@',
    '--sizeof-pointer', sizeof_pointer,
-   '--lib-path', join_paths(icd_lib_path, icd_file_name),
+   '--lib-path', vulkan_icd_lib_path / icd_file_name,
    '--out', '@OUTPUT@',
 ]
 

src/nouveau/vulkan/meson.build

@@ -161,11 +161,7 @@ libvulkan_nouveau = shared_library(
   install : true,
 )
 
-icd_lib_path = join_paths(get_option('prefix'), get_option('libdir'))
 icd_file_name = libname_prefix + 'vulkan_nouveau.' + libname_suffix
-if with_platform_windows
-  icd_lib_path = import('fs').relative_to(get_option('bindir'), with_vulkan_icd_dir)
-endif
 
 nouveau_icd = custom_target(
   'nouveau_icd',
@@ -175,7 +171,7 @@ nouveau_icd = custom_target(
     prog_python, '@INPUT0@',
     '--api-version', '1.4', '--xml', '@INPUT1@',
     '--sizeof-pointer', sizeof_pointer,
-    '--lib-path', join_paths(icd_lib_path, icd_file_name),
+    '--lib-path', vulkan_icd_lib_path / icd_file_name,
     '--out', '@OUTPUT@',
   ],
   build_by_default : true,

src/panfrost/vulkan/meson.build

@@ -246,8 +246,7 @@ panfrost_icd = custom_target(
     prog_python, '@INPUT0@',
     '--api-version', '1.4', '--xml', '@INPUT1@',
     '--sizeof-pointer', sizeof_pointer,
-    '--lib-path', join_paths(get_option('prefix'), get_option('libdir'),
-                             icd_file_name),
+    '--lib-path', vulkan_icd_lib_path / icd_file_name,
     '--out', '@OUTPUT@',
   ],
   build_by_default : true,

src/virtio/vulkan/meson.build

@@ -25,8 +25,7 @@ virtio_icd = custom_target(
     prog_python, '@INPUT0@',
     '--api-version', '1.4', '--xml', '@INPUT1@',
     '--sizeof-pointer', sizeof_pointer,
-    '--lib-path', join_paths(get_option('prefix'), get_option('libdir'),
-                             icd_file_name),
+    '--lib-path', vulkan_icd_lib_path / icd_file_name,
     '--out', '@OUTPUT@',
   ],
   build_by_default : true,