lavapipe: Use the correct ICD path on Win32
authorJason Ekstrand <jason.ekstrand@collabora.com>
Thu, 19 May 2022 17:47:50 +0000 (12:47 -0500)
committerMarge Bot <emma+marge@anholt.net>
Thu, 19 May 2022 21:53:06 +0000 (21:53 +0000)
Acked-by: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16612>

src/gallium/targets/lavapipe/meson.build

index bda4fbc..f410b44 100644 (file)
@@ -21,16 +21,21 @@ if with_platform_windows
   icd_file_name = 'vulkan_lvp.dll'
 endif
 
+icd_command = [
+  prog_python, '@INPUT0@',
+  '--api-version', '1.1', '--xml', '@INPUT1@',
+  '--lib-path', join_paths(module_dir, icd_file_name),
+  '--out', '@OUTPUT@',
+]
+if with_platform_windows
+  icd_command += '--use-backslash'
+endif
+
 lvp_icd = custom_target(
   'lvp_icd',
   input : [vk_icd_gen, vk_api_xml],
   output : 'lvp_icd.@0@.json'.format(host_machine.cpu()),
-  command : [
-    prog_python, '@INPUT0@',
-    '--api-version', '1.1', '--xml', '@INPUT1@',
-    '--lib-path', join_paths(module_dir, icd_file_name),
-    '--out', '@OUTPUT@',
-  ],
+  command : icd_command,
   build_by_default : true,
   install_dir : with_vulkan_icd_dir,
   install : true,