Browse Source

Merge pull request #87960 from bruvzg/mvk_ver_chk

[macOS] Check Vulkan SDK version when looking for MoltenVK libs.
Rémi Verschelde 1 year ago
parent
commit
6f2adcd63c
1 changed files with 2 additions and 1 deletions
  1. 2 1
      platform/macos/detect.py

+ 2 - 1
platform/macos/detect.py

@@ -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/"