raphiaura/KytyPS5
1
0
Fork 0
mirror of https://github.com/KytyPS5/KytyPS5.git synced 2026-10-27 21:36:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

macOS: auto-discover bundled MoltenVK on startup

Browse Source 
On macOS the Vulkan loader comes from MoltenVK. SDL's default
probe only searches system paths, so a bundled libMoltenVK.dylib
next to the executable is invisible under the hardened runtime.

Probe it explicitly via SDL_GetBasePath() before falling back to
SDL's default search. Respect SDL_VULKAN_LIBRARY overrides and
log which loader is used. Update README to reflect that no
environment variable is required for bundled builds.

Co-Authored-By: internal-model
This commit is contained in:
nacimoualla
2026-08-29 12:02:50 +01:00
parent 9da390bc0a
commit 85a5c04860
2 changed files with 31 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+9 -4
View File
@@ -288,12 +288,17 @@ The emulator can also be started directly with a legally obtained game directory
./_Build/linux/install/kyty_emulator --game "/games/ExampleGame" ./_Build/linux/install/kyty_emulator --game "/games/ExampleGame"
``` ```
On macOS, point SDL at the MoltenVK library explicitly; the hardened runtime prevents it from On macOS, a bundled `libMoltenVK.dylib` next to `kyty_emulator` is found automatically; no
being picked up from the executable's directory: environment variable is required:
```bash ```bash
cd _Build/macos/install ./_Build/macos/install/kyty_emulator --game "/games/ExampleGame"
SDL_VULKAN_LIBRARY="$PWD/libMoltenVK.dylib" ./kyty_emulator --game "/games/ExampleGame" ```
To override the Vulkan loader, set `SDL_VULKAN_LIBRARY`:
```bash
SDL_VULKAN_LIBRARY=/path/to/libMoltenVK.dylib ./kyty_emulator --game "/games/ExampleGame"
``` ```
Run `kyty_emulator --help` to see the available graphics, logging, validation, profiling, and Run `kyty_emulator --help` to see the available graphics, logging, validation, profiling, and
src/graphics/presentation/window/vulkanWindow.cpp
+22
View File
@@ -10,6 +10,7 @@
#include "SDL_pixels.h" #include "SDL_pixels.h"
#include "SDL_rwops.h" #include "SDL_rwops.h"
#include "SDL_stdinc.h" #include "SDL_stdinc.h"
#include "SDL_filesystem.h"
#include "SDL_surface.h" #include "SDL_surface.h"
#include "SDL_thread.h" #include "SDL_thread.h"
#include "SDL_touch.h" #include "SDL_touch.h"
@@ -40,6 +41,7 @@
#include <algorithm> #include <algorithm>
#include <cstdio> #include <cstdio>
#include <cstdlib>
#include <cstring> #include <cstring>
#include <fmt/format.h> #include <fmt/format.h>
#include <memory> #include <memory>
@@ -875,6 +877,26 @@ void WindowContext::CreateVulkan() {
EXIT_IF(graphic_ctx.device != nullptr); EXIT_IF(graphic_ctx.device != nullptr);
EXIT_IF(surface != nullptr); EXIT_IF(surface != nullptr);
#if defined(__APPLE__)
// On macOS the Vulkan loader comes from MoltenVK. SDL's default
// probe only searches system library paths, so a bundled
// libMoltenVK.dylib next to the executable is invisible under the
// hardened runtime. Probe it explicitly before falling back.
if (const char* sdl_vulkan_library = std::getenv("SDL_VULKAN_LIBRARY");
sdl_vulkan_library != nullptr) {
LOGF("Vulkan loader override: SDL_VULKAN_LIBRARY=%s\n", sdl_vulkan_library);
} else if (char* base_path = SDL_GetBasePath(); base_path != nullptr) {
const std::string moltenvk_path = std::string(base_path) + "libMoltenVK.dylib";
SDL_free(base_path);
if (SDL_Vulkan_LoadLibrary(moltenvk_path.c_str()) == 0) {
LOGF("Vulkan loader: %s\n", moltenvk_path.c_str());
} else {
LOGF("Bundled Vulkan loader not found at %s (%s); trying system loader\n",
moltenvk_path.c_str(), SDL_GetError());
}
}
#endif
auto get_instance_proc_addr = auto get_instance_proc_addr =
reinterpret_cast<PFN_vkGetInstanceProcAddr>(SDL_Vulkan_GetVkGetInstanceProcAddr()); reinterpret_cast<PFN_vkGetInstanceProcAddr>(SDL_Vulkan_GetVkGetInstanceProcAddr());
if (get_instance_proc_addr == nullptr) { if (get_instance_proc_addr == nullptr) {