From d939f95c696b20cc89d32ac141fe5ef796353eb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Tue, 24 Dec 2024 21:19:26 +0800 Subject: [PATCH] Vulkan (Android): hard code path of `libvulkan.so`, so that users don't need to install vulkan-loader wrapper of termux --- src/detection/vulkan/vulkan.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/src/detection/vulkan/vulkan.c b/src/detection/vulkan/vulkan.c index 3f26b747e..571ab50d4 100644 --- a/src/detection/vulkan/vulkan.c +++ b/src/detection/vulkan/vulkan.c @@ -39,13 +39,20 @@ static void applyDriverName(VkPhysicalDeviceDriverPropertiesKHR* properties, FFs static const char* detectVulkan(FFVulkanResult* result) { - FF_LIBRARY_LOAD(vulkan, "dlopen libvulkan"FF_LIBRARY_EXTENSION " failed", - #ifdef __APPLE__ - "libMoltenVK"FF_LIBRARY_EXTENSION, -1 - #elif defined(_WIN32) - "vulkan-1"FF_LIBRARY_EXTENSION, -1 + FF_LIBRARY_LOAD(vulkan, "dlopen libvulkan" FF_LIBRARY_EXTENSION " failed", + #if __ANDROID__ + #if UINTPTR_MAX == UINT32_MAX + "/system/lib/" + #else + "/system/lib64/" + #endif + "libvulkan" FF_LIBRARY_EXTENSION, -1 + #elif __APPLE__ + "libMoltenVK" FF_LIBRARY_EXTENSION, -1 + #elif _WIN32 + "vulkan-1" FF_LIBRARY_EXTENSION, -1 #else - "libvulkan"FF_LIBRARY_EXTENSION, 2 + "libvulkan" FF_LIBRARY_EXTENSION, 2 #endif ) FF_LIBRARY_LOAD_SYMBOL_MESSAGE(vulkan, vkGetInstanceProcAddr)