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

Merge branch 'android_gradle'

Browse source
This commit is contained in:
saschawillems 2018-05-11 12:17:30 +02:00
commit 69dca89a02
457 changed files with 12486 additions and 3643 deletions
Download patch file Download diff file Expand all files Collapse all files

29
base/vulkanexamplebase.cpp
View file

@ -333,6 +333,7 @@ void VulkanExampleBase::renderLoop()
// Exit loop, example will be destroyed in application main
if (destroy)
{
ANativeActivity_finish(androidApp->activity);
break;
}
@ -555,8 +556,10 @@ void VulkanExampleBase::renderLoop()
updateOverlay();
}
#endif
// Flush device to make sure all resources can be freed
vkDeviceWaitIdle(device);
// Flush device to make sure all resources can be freed
if (device != VK_NULL_HANDLE) {
vkDeviceWaitIdle(device);
}
}
void VulkanExampleBase::updateOverlay()
@ -831,7 +834,7 @@ VulkanExampleBase::~VulkanExampleBase()
#endif
}
void VulkanExampleBase::initVulkan()
bool VulkanExampleBase::initVulkan()
{
VkResult err;
@ -839,6 +842,7 @@ void VulkanExampleBase::initVulkan()
err = createInstance(settings.validation);
if (err) {
vks::tools::exitFatal("Could not create Vulkan instance : \n" + vks::tools::errorString(err), err);
return false;
}
#if defined(VK_USE_PLATFORM_ANDROID_KHR)
@ -865,6 +869,7 @@ void VulkanExampleBase::initVulkan()
err = vkEnumeratePhysicalDevices(instance, &gpuCount, physicalDevices.data());
if (err) {
vks::tools::exitFatal("Could not enumerate physical devices : \n" + vks::tools::errorString(err), err);
return false;
}
// GPU selection
@ -940,6 +945,7 @@ void VulkanExampleBase::initVulkan()
VkResult res = vulkanDevice->createLogicalDevice(enabledFeatures, enabledDeviceExtensions);
if (res != VK_SUCCESS) {
vks::tools::exitFatal("Could not create Vulkan device: \n" + vks::tools::errorString(res), res);
return false;
}
device = vulkanDevice->logicalDevice;
@ -989,6 +995,8 @@ void VulkanExampleBase::initVulkan()
};
LOGD("androidProduct = %s", androidProduct.c_str());
#endif
return true;
}
#if defined(_WIN32)
@ -1419,9 +1427,14 @@ void VulkanExampleBase::handleAppCommand(android_app * app, int32_t cmd)
LOGD("APP_CMD_INIT_WINDOW");
if (androidApp->window != NULL)
{
vulkanExample->initVulkan();
vulkanExample->prepare();
assert(vulkanExample->prepared);
if (vulkanExample->initVulkan()) {
vulkanExample->prepare();
assert(vulkanExample->prepared);
}
else {
LOGE("Could not initialize Vulkan, exiting!");
androidApp->destroyRequested = 1;
}
}
else
{
@ -1439,7 +1452,9 @@ void VulkanExampleBase::handleAppCommand(android_app * app, int32_t cmd)
case APP_CMD_TERM_WINDOW:
// Window is hidden or closed, clean up resources
LOGD("APP_CMD_TERM_WINDOW");
vulkanExample->swapChain.cleanup();
if (vulkanExample->prepared) {
vulkanExample->swapChain.cleanup();
}
break;
}
}