diff --git a/base/vulkanandroid.cpp b/base/vulkanandroid.cpp index 81a2ccd3..233bc255 100644 --- a/base/vulkanandroid.cpp +++ b/base/vulkanandroid.cpp @@ -48,6 +48,7 @@ PFN_vkFreeMemory vkFreeMemory; PFN_vkCreateRenderPass vkCreateRenderPass; PFN_vkCmdBeginRenderPass vkCmdBeginRenderPass; PFN_vkCmdEndRenderPass vkCmdEndRenderPass; +PFN_vkCmdExecuteCommands vkCmdExecuteCommands; PFN_vkCreateImage vkCreateImage; PFN_vkGetImageMemoryRequirements vkGetImageMemoryRequirements; PFN_vkCreateImageView vkCreateImageView; @@ -164,6 +165,7 @@ void loadVulkanFunctions(VkInstance instance) vkCreateRenderPass = reinterpret_cast(vkGetInstanceProcAddr(instance, "vkCreateRenderPass")); vkCmdBeginRenderPass = reinterpret_cast(vkGetInstanceProcAddr(instance, "vkCmdBeginRenderPass")); vkCmdEndRenderPass = reinterpret_cast(vkGetInstanceProcAddr(instance, "vkCmdEndRenderPass")); + vkCmdExecuteCommands = reinterpret_cast(vkGetInstanceProcAddr(instance, "vkCmdExecuteCommands")); vkCreateImage = reinterpret_cast(vkGetInstanceProcAddr(instance, "vkCreateImage")); vkGetImageMemoryRequirements = reinterpret_cast(vkGetInstanceProcAddr(instance, "vkGetImageMemoryRequirements")); diff --git a/base/vulkanandroid.h b/base/vulkanandroid.h index 5ceab83c..d95e4f71 100644 --- a/base/vulkanandroid.h +++ b/base/vulkanandroid.h @@ -23,6 +23,17 @@ #if defined(__ANDROID__) #include +#include + +// Missing from the NDK +namespace std +{ + template + std::unique_ptr make_unique(Args&&... args) + { + return std::unique_ptr(new T(std::forward(args)...)); + } +} #define LOGI(...) ((void)__android_log_print(ANDROID_LOG_INFO, "vulkanExample", __VA_ARGS__)) #define LOGW(...) ((void)__android_log_print(ANDROID_LOG_WARN, "vulkanExample", __VA_ARGS__)) @@ -67,6 +78,7 @@ extern PFN_vkFreeMemory vkFreeMemory; extern PFN_vkCreateRenderPass vkCreateRenderPass; extern PFN_vkCmdBeginRenderPass vkCmdBeginRenderPass; extern PFN_vkCmdEndRenderPass vkCmdEndRenderPass; +extern PFN_vkCmdExecuteCommands vkCmdExecuteCommands; extern PFN_vkCreateImage vkCreateImage; extern PFN_vkGetImageMemoryRequirements vkGetImageMemoryRequirements; extern PFN_vkCreateImageView vkCreateImageView;