From d7957a2a2091a00c8ccdebb6900e5a0f21aa205d Mon Sep 17 00:00:00 2001 From: bruvzg <7645683+bruvzg@users.noreply.github.com> Date: Thu, 12 Aug 2021 14:24:54 +0300 Subject: Use "volk" instead of statically linked Vulkan loader. --- platform/android/detect.py | 10 ++++++++-- platform/android/vulkan/vulkan_context_android.cpp | 6 +++++- 2 files changed, 13 insertions(+), 3 deletions(-) (limited to 'platform/android') diff --git a/platform/android/detect.py b/platform/android/detect.py index 1b6af8662e..9be6f33b93 100644 --- a/platform/android/detect.py +++ b/platform/android/detect.py @@ -54,6 +54,7 @@ def get_android_ndk_root(): def get_flags(): return [ ("tools", False), + ("use_volk", False), ] @@ -367,8 +368,13 @@ def configure(env): ) env.Prepend(CPPPATH=["#platform/android"]) - env.Append(CPPDEFINES=["ANDROID_ENABLED", "UNIX_ENABLED", "VULKAN_ENABLED", "NO_FCNTL"]) - env.Append(LIBS=["OpenSLES", "EGL", "GLESv2", "vulkan", "android", "log", "z", "dl"]) + env.Append(CPPDEFINES=["ANDROID_ENABLED", "UNIX_ENABLED", "NO_FCNTL"]) + env.Append(LIBS=["OpenSLES", "EGL", "GLESv2", "android", "log", "z", "dl"]) + + if env["vulkan"]: + env.Append(CPPDEFINES=["VULKAN_ENABLED"]) + if not env["use_volk"]: + env.Append(LIBS=["vulkan"]) # Return the project NDK version. diff --git a/platform/android/vulkan/vulkan_context_android.cpp b/platform/android/vulkan/vulkan_context_android.cpp index a031f3beee..f06a30f3a4 100644 --- a/platform/android/vulkan/vulkan_context_android.cpp +++ b/platform/android/vulkan/vulkan_context_android.cpp @@ -30,7 +30,11 @@ #include "vulkan_context_android.h" -#include +#ifdef USE_VOLK +#include +#else +#include +#endif const char *VulkanContextAndroid::_get_platform_surface_extension() const { return VK_KHR_ANDROID_SURFACE_EXTENSION_NAME; -- cgit v1.2.3