diff options
Diffstat (limited to 'platform/android')
| -rw-r--r-- | platform/android/detect.py | 10 | ||||
| -rw-r--r-- | platform/android/display_server_android.cpp | 4 | ||||
| -rw-r--r-- | platform/android/vulkan/vulkan_context_android.cpp | 6 |
3 files changed, 15 insertions, 5 deletions
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/display_server_android.cpp b/platform/android/display_server_android.cpp index af8829324b..d200d024c5 100644 --- a/platform/android/display_server_android.cpp +++ b/platform/android/display_server_android.cpp @@ -538,8 +538,8 @@ void DisplayServerAndroid::process_key_event(int p_keycode, int p_scancode, int meta_mem = p_pressed; } - ev->set_keycode(keycode); - ev->set_physical_keycode(phy_keycode); + ev->set_keycode((Key)keycode); + ev->set_physical_keycode((Key)phy_keycode); ev->set_unicode(val); ev->set_pressed(p_pressed); 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 <vulkan/vulkan_android.h> +#ifdef USE_VOLK +#include <volk.h> +#else +#include <vulkan/vulkan.h> +#endif const char *VulkanContextAndroid::_get_platform_surface_extension() const { return VK_KHR_ANDROID_SURFACE_EXTENSION_NAME; |