diff --git a/base/vulkandevice.hpp b/base/vulkandevice.hpp index 61b424ac..b0e30863 100644 --- a/base/vulkandevice.hpp +++ b/base/vulkandevice.hpp @@ -308,7 +308,7 @@ namespace vk deviceCreateInfo.pEnabledFeatures = &enabledFeatures; // Enable the debug marker extension if it is present (likely meaning a debugging tool is present) - if (vkTools::checkDeviceExtensionPresent(physicalDevice, VK_EXT_DEBUG_MARKER_EXTENSION_NAME)) + if (extensionSupported(VK_EXT_DEBUG_MARKER_EXTENSION_NAME)) { deviceExtensions.push_back(VK_EXT_DEBUG_MARKER_EXTENSION_NAME); enableDebugMarkers = true; diff --git a/base/vulkantools.cpp b/base/vulkantools.cpp index 225213cb..acdd2944 100644 --- a/base/vulkantools.cpp +++ b/base/vulkantools.cpp @@ -10,41 +10,6 @@ namespace vkTools { - - VkBool32 checkGlobalExtensionPresent(const char* extensionName) - { - uint32_t extensionCount = 0; - std::vector extensions; - vkEnumerateInstanceExtensionProperties(NULL, &extensionCount, NULL); - extensions.resize(extensionCount); - vkEnumerateInstanceExtensionProperties(NULL, &extensionCount, extensions.data()); - for (auto& ext : extensions) - { - if (!strcmp(extensionName, ext.extensionName)) - { - return true; - } - } - return false; - } - - VkBool32 checkDeviceExtensionPresent(VkPhysicalDevice physicalDevice, const char* extensionName) - { - uint32_t extensionCount = 0; - std::vector extensions; - vkEnumerateDeviceExtensionProperties(physicalDevice, NULL, &extensionCount, NULL); - extensions.resize(extensionCount); - vkEnumerateDeviceExtensionProperties(physicalDevice, NULL, &extensionCount, extensions.data()); - for (auto& ext : extensions) - { - if (!strcmp(extensionName, ext.extensionName)) - { - return true; - } - } - return false; - } - std::string errorString(VkResult errorCode) { switch (errorCode) diff --git a/base/vulkantools.h b/base/vulkantools.h index 96fd98aa..50f626a5 100644 --- a/base/vulkantools.h +++ b/base/vulkantools.h @@ -1,5 +1,5 @@ /* -* Assorted commonly used Vulkan helper functions +* Contain struct initializers and assorted Vulkan helper functions * * Copyright (C) 2016 by Sascha Willems - www.saschawillems.de * @@ -47,10 +47,6 @@ namespace vkTools { - // Check if extension is globally available - VkBool32 checkGlobalExtensionPresent(const char* extensionName); - // Check if extension is present on the given device - VkBool32 checkDeviceExtensionPresent(VkPhysicalDevice physicalDevice, const char* extensionName); // Return string representation of a vulkan error string std::string errorString(VkResult errorCode); @@ -93,7 +89,7 @@ namespace vkTools VkShaderModule loadShaderGLSL(const char *fileName, VkDevice device, VkShaderStageFlagBits stage); // Contains often used vulkan object initializers - // Save lot of VK_STRUCTURE_TYPE assignments + // Saves lot of VK_STRUCTURE_TYPE assignments // Some initializers are parameterized for convenience namespace initializers {