diff --git a/VulkanHppGenerator.cpp b/VulkanHppGenerator.cpp index 02dfded..84ccc6f 100644 --- a/VulkanHppGenerator.cpp +++ b/VulkanHppGenerator.cpp @@ -1482,9 +1482,9 @@ void VulkanHppGenerator::checkStructCorrectness() const else { // check for non-alias structureTypes only - checkForError( !enumValue.alias.empty() || ( sTypeValues.erase( enumValue.name ) == 1 ), - enumValue.xmlLine, - "VkStructureType enum value <" + enumValue.name + "> never used" ); + checkForWarning( !enumValue.alias.empty() || ( sTypeValues.erase( enumValue.name ) == 1 ), + enumValue.xmlLine, + "VkStructureType enum value <" + enumValue.name + "> never used" ); } } assert( sTypeValues.empty() ); @@ -11813,13 +11813,14 @@ std::string VulkanHppGenerator::generateSharedHandle( std::pair; ${aliasHandle})"; - return replaceWithMap( sharedHandleTemplate, - { { "aliasHandle", aliasHandle }, - { "deleterAction", ( handleData.second.deleteCommand.substr( 2, 4 ) == "Free" ) ? "Free" : "Destroy" }, - { "deleterPool", handleData.second.deletePool.empty() ? "" : ", " + stripPrefix( handleData.second.deletePool, "Vk" ) }, - { "deleterType", handleData.second.deletePool.empty() ? "Object" : "Pool" }, - { "destructor", handleData.second.destructorType.empty() ? "NoDestructor" : stripPrefix( handleData.second.destructorType, "Vk" ) }, - { "type", type } } ); + return replaceWithMap( + sharedHandleTemplate, + { { "aliasHandle", aliasHandle }, + { "deleterAction", ( handleData.second.deleteCommand.substr( 2, 4 ) == "Free" ) ? "Free" : "Destroy" }, + { "deleterPool", handleData.second.deletePool.empty() ? "" : ", " + stripPrefix( handleData.second.deletePool, "Vk" ) }, + { "deleterType", handleData.second.deletePool.empty() ? "Object" : "Pool" }, + { "destructor", handleData.second.destructorType.empty() ? "NoDestructor" : stripPrefix( handleData.second.destructorType, "Vk" ) }, + { "type", type } } ); } return ""; } @@ -15155,7 +15156,7 @@ void VulkanHppGenerator::registerDeleter( std::string const & commandName, Comma auto handleIt = m_handles.find( commandData.params[valueIndex].type.type ); assert( handleIt != m_handles.end() ); - handleIt->second.deleteCommand = commandName; + handleIt->second.deleteCommand = commandName; handleIt->second.destructorType = key; } } diff --git a/vulkan/vulkan.hpp b/vulkan/vulkan.hpp index 8327f29..a3c2682 100644 --- a/vulkan/vulkan.hpp +++ b/vulkan/vulkan.hpp @@ -13895,7 +13895,7 @@ namespace VULKAN_HPP_NAMESPACE # elif defined( __APPLE__ ) m_library = dlopen( "libvulkan.dylib", RTLD_NOW | RTLD_LOCAL ); # elif defined( _WIN32 ) - m_library = ::LoadLibraryA( "vulkan-1.dll" ); + m_library = ::LoadLibraryA( "vulkan-1.dll" ); # else # error unsupported platform # endif