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

[GitLab Mirror]

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

Author: Boris Brezillon <boris.brezillon at collabora.com>
Date:   Fri May 20 04:53:30 2022 -0700

dzn: Use the correct ICD path on Win32

Similar to commit c6cddd2e17e ("lavapipe: Use the correct ICD path on
Win32"), but applied to dozen.

Suggested-by: Erik Faye-Lund <erik.faye-lund at collabora.com>
Reviewed-by: Erik Faye-Lund <erik.faye-lund at collabora.com>
Reviewed-by: Jason Ekstrand <jason.ekstrand at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16634>

---

 src/microsoft/vulkan/meson.build | 34 ++++++++++++++++++++++------------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/src/microsoft/vulkan/meson.build b/src/microsoft/vulkan/meson.build
index 6684197c4e3..d814b645bf6 100644
--- a/src/microsoft/vulkan/meson.build
+++ b/src/microsoft/vulkan/meson.build
@@ -85,16 +85,31 @@ if with_platform_windows
   icd_file_name = 'vulkan_dzn.dll'
 endif
 
+
+icd_command = [
+   prog_python, '@INPUT0@',
+   '--api-version', '1.1', '--xml', '@INPUT1@',
+   '--lib-path', join_paths(module_dir, icd_file_name),
+   '--out', '@OUTPUT@',
+]
+
+icd_dev_command = [
+   prog_python, '@INPUT0@',
+   '--api-version', '1.1', '--xml', '@INPUT1@',
+   '--lib-path', join_paths(meson.current_build_dir(), icd_file_name),
+   '--out', '@OUTPUT@',
+]
+
+if with_platform_windows
+  icd_command += '--use-backslash'
+  icd_dev_command += '--use-backslash'
+endif
+
 dzn_icd = custom_target(
   'dzn_icd',
   input : [vk_icd_gen, vk_api_xml],
   output : 'dzn_icd. at 0@.json'.format(host_machine.cpu()),
-  command : [
-    prog_python, '@INPUT0@',
-    '--api-version', '1.2', '--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,
@@ -106,12 +121,7 @@ if meson.version().version_compare('>= 0.58')
     'dzn_devenv_icd',
     input : [vk_icd_gen, vk_api_xml],
     output : _dev_icdname,
-    command : [
-      prog_python, '@INPUT0@',
-      '--api-version', '1.1', '--xml', '@INPUT1@',
-      '--lib-path', meson.current_build_dir() / icd_file_name,
-      '--out', '@OUTPUT@',
-    ],
+    command : icd_dev_command,
     build_by_default : true,
   )