diff --git a/base/vulkandebug.cpp b/base/vulkandebug.cpp index 9f2fce94..9e38c673 100644 --- a/base/vulkandebug.cpp +++ b/base/vulkandebug.cpp @@ -76,7 +76,7 @@ namespace vkDebug instance, &dbgCreateInfo, nullptr, - (callBack != nullptr) ? &callBack : &msgCallback); + (callBack != VK_NULL_HANDLE) ? &callBack : &msgCallback); assert(!err); } diff --git a/base/vulkanexamplebase.cpp b/base/vulkanexamplebase.cpp index bc7edec2..8db02739 100644 --- a/base/vulkanexamplebase.cpp +++ b/base/vulkanexamplebase.cpp @@ -247,7 +247,7 @@ void VulkanExampleBase::prepare() { 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(); createSetupCommandBuffer(); @@ -887,10 +887,6 @@ void VulkanExampleBase::initVulkan(bool enableValidation) vkGetPhysicalDeviceProperties(physicalDevice, &deviceProperties); vkGetPhysicalDeviceFeatures(physicalDevice, &deviceFeatures); -#if defined(__ANDROID__) - LOGD(deviceProperties.deviceName); -#endif - // Gather physical device memory properties vkGetPhysicalDeviceMemoryProperties(physicalDevice, &deviceMemoryProperties);