diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-08-13 08:42:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-13 08:42:58 +0200 |
| commit | 4c53669d8ab07b27cbf953840b3007357addb16b (patch) | |
| tree | 271c5a2448b4b067eeeb05afd6045a881de0dc26 /platform/android | |
| parent | d4c04a9b431da5c8797da900e89737d6a2da6413 (diff) | |
| parent | 7b7e17a626392aee0850889e3487b282f0bbc9b6 (diff) | |
Merge pull request #51524 from RandomShaper/faster_vma
Upgrade Vulkan Memory Allocator, use Volk on Android
Diffstat (limited to 'platform/android')
| -rw-r--r-- | platform/android/detect.py | 1 | ||||
| -rw-r--r-- | platform/android/vulkan/vulkan_context_android.cpp | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/platform/android/detect.py b/platform/android/detect.py index 9be6f33b93..7a993e9ca6 100644 --- a/platform/android/detect.py +++ b/platform/android/detect.py @@ -54,7 +54,6 @@ def get_android_ndk_root(): def get_flags(): return [ ("tools", False), - ("use_volk", False), ] diff --git a/platform/android/vulkan/vulkan_context_android.cpp b/platform/android/vulkan/vulkan_context_android.cpp index f06a30f3a4..e24d1a4527 100644 --- a/platform/android/vulkan/vulkan_context_android.cpp +++ b/platform/android/vulkan/vulkan_context_android.cpp @@ -48,7 +48,7 @@ int VulkanContextAndroid::window_create(ANativeWindow *p_window, DisplayServer:: createInfo.window = p_window; VkSurfaceKHR surface; - VkResult err = vkCreateAndroidSurfaceKHR(_get_instance(), &createInfo, nullptr, &surface); + VkResult err = vkCreateAndroidSurfaceKHR(get_instance(), &createInfo, nullptr, &surface); if (err != VK_SUCCESS) { ERR_FAIL_V_MSG(-1, "vkCreateAndroidSurfaceKHR failed with error " + itos(err)); } |