fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-20 09:30:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

radv: Update JSON generator if Windows

Browse source 
Use vulkan_radeon.dll, and apply current working directory.

Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8911>
This commit is contained in:
James Park 2021-02-07 18:38:58 -08:00 • committed by Marge Bot
parent 8930ecd3ce
commit 7008e6558a
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/amd/vulkan/meson.build
View file

@ -207,13 +207,21 @@ if with_symbols_check
) )
endif endif
icd_lib_path = join_paths(get_option('prefix'), get_option('libdir'))
icd_file_name = 'libvulkan_radeon.so'
if with_platform_windows
icd_lib_path = '.'
icd_file_name = 'vulkan_radeon.dll'
endif
radeon_icd = custom_target( radeon_icd = custom_target(
'radeon_icd', 'radeon_icd',
input : 'radv_icd.py', input : 'radv_icd.py',
output : 'radeon_icd.@0@.json'.format(host_machine.cpu()), output : 'radeon_icd.@0@.json'.format(host_machine.cpu()),
command : [ command : [
prog_python, '@INPUT@', prog_python, '@INPUT@',
'--lib-path', join_paths(get_option('prefix'), get_option('libdir')), '--lib-path', icd_lib_path,
'--file-name', icd_file_name,
'--out', '@OUTPUT@', '--out', '@OUTPUT@',
], ],
depend_files : files('radv_extensions.py'), depend_files : files('radv_extensions.py'),

5
src/amd/vulkan/radv_icd.py
View file

@ -28,10 +28,11 @@ from radv_extensions import *
if __name__ == '__main__': if __name__ == '__main__':
parser = argparse.ArgumentParser() parser = argparse.ArgumentParser()
parser.add_argument('--out', help='Output json file.', required=True) parser.add_argument('--out', help='Output json file.', required=True)
parser.add_argument('--lib-path', help='Path to libvulkan_radeon.so') parser.add_argument('--lib-path', help='Path to file')
parser.add_argument('--file-name', help='Name of file')
args = parser.parse_args() args = parser.parse_args()
path = 'libvulkan_radeon.so' path = args.file_name
if args.lib_path: if args.lib_path:
path = os.path.join(args.lib_path, path) path = os.path.join(args.lib_path, path)