godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #87960 from bruvzg/mvk_ver_chk 

[macOS] Check Vulkan SDK version when looking for MoltenVK libs.
This commit is contained in:
Rémi Verschelde 2024-02-05 14:54:56 +01:00
parent 01fd96e19d 70e328385c
commit 6f2adcd63c
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
platform/macos/detect.py
View File

@ -67,13 +67,14 @@ def get_mvk_sdk_path():
if not os.path.exists(dirname): if not os.path.exists(dirname):
return "" return ""
ver_min = ver_parse("1.3.231.0")
ver_num = ver_parse("0.0.0.0") ver_num = ver_parse("0.0.0.0")
files = os.listdir(dirname) files = os.listdir(dirname)
lib_name_out = dirname lib_name_out = dirname
for file in files: for file in files:
if os.path.isdir(os.path.join(dirname, file)): if os.path.isdir(os.path.join(dirname, file)):
ver_comp = ver_parse(file) ver_comp = ver_parse(file)
if ver_comp > ver_num: if ver_comp > ver_num and ver_comp >= ver_min:
# Try new SDK location. # Try new SDK location.
lib_name = os.path.join( lib_name = os.path.join(
os.path.join(dirname, file), "macOS/lib/MoltenVK.xcframework/macos-arm64_x86_64/" os.path.join(dirname, file), "macOS/lib/MoltenVK.xcframework/macos-arm64_x86_64/"