From 3bcde868efa83f8e2f5a35dd7daaaa848bd7afc3 Mon Sep 17 00:00:00 2001 From: Lynix Date: Sat, 30 Apr 2016 11:41:36 +0200 Subject: [PATCH] Vulkan/Instance: Fix possible crash when not using layers or extensions Former-commit-id: a429d0f1032f1a39ee50075b366d83cf4cba0823 --- include/Nazara/Vulkan/VkInstance.inl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/Nazara/Vulkan/VkInstance.inl b/include/Nazara/Vulkan/VkInstance.inl index 8f0f6d2af..801691855 100644 --- a/include/Nazara/Vulkan/VkInstance.inl +++ b/include/Nazara/Vulkan/VkInstance.inl @@ -39,9 +39,9 @@ namespace Nz 0, &appInfo, static_cast(layers.size()), - &layers[0], + (!layers.empty()) ? layers.data() : nullptr, static_cast(extensions.size()), - &extensions[0] + (!extensions.empty()) ? extensions.data() : nullptr }; return Create(instanceInfo, allocator); @@ -69,12 +69,12 @@ namespace Nz inline bool Instance::IsExtensionLoaded(const String& extensionName) { - return m_loadedExtensions.count(extensionName) != 0; + return m_loadedExtensions.count(extensionName) > 0; } inline bool Instance::IsLayerLoaded(const String& layerName) { - return m_loadedLayers.count(layerName) != 0; + return m_loadedLayers.count(layerName) > 0; } inline Instance::operator VkInstance()