Skip to content

[RFC] osxbundle: bundle KosmicKrisp vulkan loader/driver #17575

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
Akemi wants to merge 4 commits into
base: master
Choose a base branch
from
+11 −8
Open

[RFC] osxbundle: bundle KosmicKrisp vulkan loader/driver #17575

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8882376
osxbundle: fix a wrong vulkan search path
Akemi Mar 14, 2026
e5c6098
osxbundle: fix vulkan loader search path check
Akemi Mar 14, 2026
8d4b210
osxbundle: bundle KosmicKrisp vulkan loader/driver
Akemi Mar 14, 2026
cd475e7
ci/mac: install mesa and KosmicKrisp
Akemi Mar 14, 2026
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
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ jobs:
if brew list ffmpeg &> /dev/null; then brew unlink ffmpeg; fi
brew install -q autoconf automake pkgconf libtool python freetype fribidi little-cms2 \
luajit libass ffmpeg-full meson rust uchardet mujs libplacebo molten-vk vulkan-loader vulkan-headers \
libarchive libbluray libcaca libcdio-paranoia libdvdnav rubberband zimg
libarchive libbluray libcaca libcdio-paranoia libdvdnav rubberband zimg mesa
brew link ffmpeg-full

- name: Build with meson
Expand Down
17 changes: 10 additions & 7 deletions TOOLS/dylib_unhell.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,30 +227,32 @@ def process_vulkan_loader(binary, loader_name, loader_relative_folder, library_n
os.path.join("/etc", loader_relative_folder),
os.path.join(os.path.expanduser("~"), ".local/share", loader_relative_folder),
os.path.join("/usr/local/share", loader_relative_folder),
os.path.join("/usr/share/vulkan", loader_relative_folder),
os.path.join("/usr/share", loader_relative_folder),
os.path.join(get_homebrew_prefix(), "etc", loader_relative_folder),
os.path.join(get_homebrew_prefix(), "share", loader_relative_folder), # old location
]

loader_system_folder = ""
loader_system_path = ""
for loader_system_search_folder in loader_system_search_folders:
if os.path.exists(loader_system_search_folder):
loader_system_folder = loader_system_search_folder
break
if os.path.exists(os.path.join(loader_system_folder, loader_name)):
loader_system_path = os.path.join(loader_system_folder, loader_name)
break

if not loader_system_folder:
print(">>> could not find loader folder " + loader_relative_folder)
return

if not loader_system_path:
print(">>> could not find loader " + loader_name)
return

loader_bundle_folder = os.path.join(resources_path(binary), loader_relative_folder)
loader_system_path = os.path.join(loader_system_folder, loader_name)
loader_bundle_path = os.path.join(loader_bundle_folder, loader_name)
library_relative_folder = "../../../Frameworks/"

if not os.path.exists(loader_system_path):
print(">>> could not find loader " + loader_name)
return

if not os.path.exists(loader_bundle_folder):
os.makedirs(loader_bundle_folder)

Expand Down Expand Up @@ -301,6 +303,7 @@ def process(binary):

print(">> copying and processing vulkan loader")
process_vulkan_loader(binary, "MoltenVK_icd.json", "vulkan/icd.d", "ICD")
process_vulkan_loader(binary, "kosmickrisp_mesa_icd.aarch64.json", "vulkan/icd.d", "ICD")
if check_vulkan_max_version("1.3.261.1"):
process_vulkan_loader(
binary,
Expand Down
Loading