KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dzn: Use the correct ICD path on Win32 

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

Suggested-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Reviewed-by: Jason Ekstrand <jason.ekstrand@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16634>
This commit is contained in:
Boris Brezillon 2022-05-20 04:53:30 -07:00 committed by Marge Bot
parent c79451e23c
commit 47c6f7ccf3
1 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/microsoft/vulkan/meson.build
View File

@ -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.@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,
)