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

Fixing Android build error and warnings

Browse source
This commit is contained in:
saschawillems 2016-05-20 20:21:06 +02:00
parent a7a1a8aed4
commit 96df99f1f2
2 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
base/vulkandebug.cpp
View file

@ -76,7 +76,7 @@ namespace vkDebug
instance, instance,
&dbgCreateInfo, &dbgCreateInfo,
nullptr, nullptr,
(callBack != nullptr) ? &callBack : &msgCallback); (callBack != VK_NULL_HANDLE) ? &callBack : &msgCallback);
assert(!err); assert(!err);
} }

6
base/vulkanexamplebase.cpp
View file

@ -247,7 +247,7 @@ void VulkanExampleBase::prepare()
{ {
if (enableValidation) if (enableValidation)
{ {
vkDebug::setupDebugging(instance, VK_DEBUG_REPORT_ERROR_BIT_EXT | VK_DEBUG_REPORT_WARNING_BIT_EXT, NULL); vkDebug::setupDebugging(instance, VK_DEBUG_REPORT_ERROR_BIT_EXT | VK_DEBUG_REPORT_WARNING_BIT_EXT, VK_NULL_HANDLE);
} }
createCommandPool(); createCommandPool();
createSetupCommandBuffer(); createSetupCommandBuffer();
@ -887,10 +887,6 @@ void VulkanExampleBase::initVulkan(bool enableValidation)
vkGetPhysicalDeviceProperties(physicalDevice, &deviceProperties); vkGetPhysicalDeviceProperties(physicalDevice, &deviceProperties);
vkGetPhysicalDeviceFeatures(physicalDevice, &deviceFeatures); vkGetPhysicalDeviceFeatures(physicalDevice, &deviceFeatures);
#if defined(__ANDROID__)
LOGD(deviceProperties.deviceName);
#endif
// Gather physical device memory properties // Gather physical device memory properties
vkGetPhysicalDeviceMemoryProperties(physicalDevice, &deviceMemoryProperties); vkGetPhysicalDeviceMemoryProperties(physicalDevice, &deviceMemoryProperties);