Skip to content

dependencies/ui.py: Improve Vulkan detection on Windows #15263

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fanc999-1 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

dependencies/ui.py: Improve Vulkan detection on Windows #15263

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 27 additions & 4 deletions mesonbuild/dependencies/ui.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
from ..mesonlib import (
Popen_safe, version_compare_many
)
from ..envconfig import detect_cpu_family

from .base import DependencyException, DependencyMethods, DependencyTypeName, SystemDependency
from .configtool import ConfigToolDependency
Expand Down Expand Up @@ -190,10 +189,34 @@ def __init__(self, name: str, environment: 'Environment', kwargs: DependencyObje
inc_dir = 'include'
if self.env.machines[self.for_machine].is_windows():
lib_name = 'vulkan-1'
lib_dir = 'Lib32'
lib_dir = ''
inc_dir = 'Include'
if detect_cpu_family(self.env.coredata.compilers.host) == 'x86_64':
lib_dir = 'Lib'
build_cpu = self.env.machines.build.cpu_family
host_cpu = self.env.machines.host.cpu_family
if build_cpu == 'x86_64':
if host_cpu == build_cpu:
lib_dir = 'Lib'
elif host_cpu == 'aarch64':
lib_dir = 'Lib-ARM64'
elif host_cpu == 'x86':
lib_dir = 'Lib32'
elif build_cpu == 'aarch64':
if host_cpu == build_cpu:
lib_dir = 'Lib'
elif host_cpu == 'x86_64':
lib_dir = 'Lib-x64'
elif host_cpu == 'x86':
lib_dir = 'Lib32'
elif build_cpu == 'x86':
if host_cpu == build_cpu:
lib_dir = 'Lib32'
if host_cpu == 'aarch64':
lib_dir = 'Lib-ARM64'
elif host_cpu == 'x86_64':
lib_dir = 'Lib'

if lib_dir == '':
raise DependencyException(f'Target architecture \'{host_cpu}\' is not supported for this Vulkan SDK.')

# make sure header and lib are valid
inc_path = os.path.join(self.vulkan_sdk, inc_dir)
Expand Down
Loading