Mesa (main): lavapipe: Use the correct ICD path on Win32

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: c6cddd2e17e30e02d476bfd04c9c3af5aea4f6b1
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c6cddd2e17e30e02d476bfd04c9c3af5aea4f6b1

Author: Jason Ekstrand <jason.ekstrand at collabora.com>
Date:   Thu May 19 12:47:50 2022 -0500

lavapipe: Use the correct ICD path on Win32

Acked-by: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16612>

---

 src/gallium/targets/lavapipe/meson.build | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/gallium/targets/lavapipe/meson.build b/src/gallium/targets/lavapipe/meson.build
index bda4fbc574d..f410b444815 100644
--- a/src/gallium/targets/lavapipe/meson.build
+++ b/src/gallium/targets/lavapipe/meson.build
@@ -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. at 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,