Fix Android builds

Recent changes to ktx integration were missing Fixes #1168
SaschaWillems · Nov 22, 2024 · 2871b76 · 2871b76
1 parent d184cf6
commit 2871b76
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/android/examples/base/CMakeLists.txt b/android/examples/base/CMakeLists.txt
@@ -18,6 +18,7 @@ set(KTX_SOURCES
 	${KTX_DIR}/lib/swap.c
 	${KTX_DIR}/lib/memstream.c
 	${KTX_DIR}/lib/filestream.c
+	${KTX_DIR}/lib/vkloader.c
 )
 set(KTX_INCLUDE
 	${KTX_DIR}/include

diff --git a/android/examples/base/liblibktx.a b/android/examples/base/liblibktx.a
diff --git a/base/VulkanAndroid.cpp b/base/VulkanAndroid.cpp
@@ -1,7 +1,7 @@
 /*
 * Android Vulkan function pointer loader
 *
-* Copyright (C) 2016-2023 by Sascha Willems - www.saschawillems.de
+* Copyright (C) 2016-2024 by Sascha Willems - www.saschawillems.de
 *
 * This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT)
 */
@@ -142,6 +142,8 @@ PFN_vkQueuePresentKHR vkQueuePresentKHR;
 
 PFN_vkResetCommandBuffer vkResetCommandBuffer;
 
+PFN_vkGetPhysicalDeviceImageFormatProperties vkGetPhysicalDeviceImageFormatProperties;
+
 int32_t vks::android::screenDensity;
 
 void *libVulkan;
@@ -325,6 +327,8 @@ namespace vks
 			vkQueuePresentKHR = reinterpret_cast<PFN_vkQueuePresentKHR>(vkGetInstanceProcAddr(instance, "vkQueuePresentKHR"));
 
 			vkResetCommandBuffer = reinterpret_cast<PFN_vkResetCommandBuffer>(vkGetInstanceProcAddr(instance, "vkResetCommandBuffer"));
+
+			vkGetPhysicalDeviceImageFormatProperties = reinterpret_cast<PFN_vkGetPhysicalDeviceImageFormatProperties>(vkGetInstanceProcAddr(instance, "vkGetPhysicalDeviceImageFormatProperties"));
 		}
 
 		void freeVulkanLibrary()

diff --git a/base/VulkanAndroid.h b/base/VulkanAndroid.h
@@ -1,7 +1,7 @@
 /*
 * Android Vulkan function pointer prototypes
 *
-* Copyright (C) 2016-2023 by Sascha Willems - www.saschawillems.de
+* Copyright (C) 2016-2024 by Sascha Willems - www.saschawillems.de
 *
 * This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT)
 */
@@ -176,6 +176,8 @@ extern PFN_vkQueuePresentKHR vkQueuePresentKHR;
 
 extern PFN_vkResetCommandBuffer vkResetCommandBuffer;
 
+extern PFN_vkGetPhysicalDeviceImageFormatProperties vkGetPhysicalDeviceImageFormatProperties;
+
 namespace vks
 {
 	namespace android