claude_code/procedural-3d-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix Android builds

Browse source 
Recent changes to ktx integration were missing
Fixes #1168
This commit is contained in:
Sascha Willems 2024-11-22 17:44:31 +01:00
parent d184cf64c5
commit 2871b76a0f
4 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
android/examples/base/CMakeLists.txt
View file

@ -18,6 +18,7 @@ set(KTX_SOURCES
${KTX_DIR}/lib/swap.c ${KTX_DIR}/lib/swap.c
${KTX_DIR}/lib/memstream.c ${KTX_DIR}/lib/memstream.c
${KTX_DIR}/lib/filestream.c ${KTX_DIR}/lib/filestream.c
${KTX_DIR}/lib/vkloader.c
) )
set(KTX_INCLUDE set(KTX_INCLUDE
${KTX_DIR}/include ${KTX_DIR}/include

BIN
android/examples/base/liblibktx.a
View file

Binary file not shown.

6
base/VulkanAndroid.cpp
View file

@ -1,7 +1,7 @@
/* /*
* Android Vulkan function pointer loader * 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) * 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_vkResetCommandBuffer vkResetCommandBuffer;
PFN_vkGetPhysicalDeviceImageFormatProperties vkGetPhysicalDeviceImageFormatProperties;
int32_t vks::android::screenDensity; int32_t vks::android::screenDensity;
void *libVulkan; void *libVulkan;
@ -325,6 +327,8 @@ namespace vks
vkQueuePresentKHR = reinterpret_cast<PFN_vkQueuePresentKHR>(vkGetInstanceProcAddr(instance, "vkQueuePresentKHR")); vkQueuePresentKHR = reinterpret_cast<PFN_vkQueuePresentKHR>(vkGetInstanceProcAddr(instance, "vkQueuePresentKHR"));
vkResetCommandBuffer = reinterpret_cast<PFN_vkResetCommandBuffer>(vkGetInstanceProcAddr(instance, "vkResetCommandBuffer")); vkResetCommandBuffer = reinterpret_cast<PFN_vkResetCommandBuffer>(vkGetInstanceProcAddr(instance, "vkResetCommandBuffer"));
vkGetPhysicalDeviceImageFormatProperties = reinterpret_cast<PFN_vkGetPhysicalDeviceImageFormatProperties>(vkGetInstanceProcAddr(instance, "vkGetPhysicalDeviceImageFormatProperties"));
} }
void freeVulkanLibrary() void freeVulkanLibrary()

4
base/VulkanAndroid.h
View file

@ -1,7 +1,7 @@
/* /*
* Android Vulkan function pointer prototypes * 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) * 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_vkResetCommandBuffer vkResetCommandBuffer;
extern PFN_vkGetPhysicalDeviceImageFormatProperties vkGetPhysicalDeviceImageFormatProperties;
namespace vks namespace vks
{ {
namespace android namespace android