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

Moved Android functions into separate namespace (vks::android)

Browse source
This commit is contained in:
saschawillems 2017-03-10 17:23:17 +01:00
parent a5a2211489
commit 82521aaafb
3 changed files with 170 additions and 158 deletions
Download patch file Download diff file Expand all files Collapse all files

6
base/vulkanandroid.cpp
View file

@ -121,6 +121,10 @@ PFN_vkDestroySurfaceKHR vkDestroySurfaceKHR;
void *libVulkan; void *libVulkan;
namespace vks
{
namespace android
{
// Dynamically load Vulkan library and base function pointers // Dynamically load Vulkan library and base function pointers
bool loadVulkanLibrary() bool loadVulkanLibrary()
{ {
@ -277,5 +281,7 @@ void freeVulkanLibrary()
{ {
dlclose(libVulkan); dlclose(libVulkan);
} }
}
}
#endif #endif

6
base/vulkanandroid.h
View file

@ -151,9 +151,15 @@ extern PFN_vkCmdCopyQueryPoolResults vkCmdCopyQueryPoolResults;
extern PFN_vkCreateAndroidSurfaceKHR vkCreateAndroidSurfaceKHR; extern PFN_vkCreateAndroidSurfaceKHR vkCreateAndroidSurfaceKHR;
extern PFN_vkDestroySurfaceKHR vkDestroySurfaceKHR; extern PFN_vkDestroySurfaceKHR vkDestroySurfaceKHR;
namespace vks
{
namespace android
{
bool loadVulkanLibrary(); bool loadVulkanLibrary();
void loadVulkanFunctions(VkInstance instance); void loadVulkanFunctions(VkInstance instance);
void freeVulkanLibrary(); void freeVulkanLibrary();
}
}
#endif #endif

4
base/vulkanexamplebase.cpp
View file

@ -645,7 +645,7 @@ VulkanExampleBase::VulkanExampleBase(bool enableValidation)
#if defined(__ANDROID__) #if defined(__ANDROID__)
// Vulkan library is loaded dynamically on Android // Vulkan library is loaded dynamically on Android
bool libLoaded = loadVulkanLibrary(); bool libLoaded = vks::android::loadVulkanLibrary();
assert(libLoaded); assert(libLoaded);
#elif defined(_DIRECT2DISPLAY) #elif defined(_DIRECT2DISPLAY)
@ -746,7 +746,7 @@ void VulkanExampleBase::initVulkan()
} }
#if defined(__ANDROID__) #if defined(__ANDROID__)
loadVulkanFunctions(instance); vks::android::loadVulkanFunctions(instance);
#endif #endif
// If requested, we enable the default validation layers for debugging // If requested, we enable the default validation layers for debugging