diff --git a/VulkanHppGenerator.cpp b/VulkanHppGenerator.cpp index 393cb13..db8fc2b 100644 --- a/VulkanHppGenerator.cpp +++ b/VulkanHppGenerator.cpp @@ -321,37 +321,40 @@ ${DispatchLoaderDynamic} #endif )"; - std::string str = replaceWithMap( vulkanHppTemplate, - { { "ArrayProxy", readSnippet( "ArrayProxy.hpp" ) }, - { "ArrayProxyNoTemporaries", readSnippet( "ArrayProxyNoTemporaries.hpp" ) }, - { "ArrayWrapper1D", readSnippet( "ArrayWrapper1D.hpp" ) }, - { "ArrayWrapper2D", readSnippet( "ArrayWrapper2D.hpp" ) }, - { "baseTypes", generateBaseTypes() }, - { "defines", readSnippet( "defines.hpp" ) }, - { "DispatchLoaderBase", readSnippet( "DispatchLoaderBase.hpp" ) }, - { "DispatchLoaderDefault", readSnippet( "DispatchLoaderDefault.hpp" ) }, - { "DispatchLoaderDynamic", generateDispatchLoaderDynamic() }, - { "DispatchLoaderStatic", generateDispatchLoaderStatic() }, - { "DynamicLoader", readSnippet( "DynamicLoader.hpp" ) }, - { "Exceptions", readSnippet( "Exceptions.hpp" ) }, - { "Flags", readSnippet( "Flags.hpp" ) }, - { "headerVersion", m_version }, - { "includes", replaceWithMap( readSnippet( "includes.hpp" ), { { "vulkan", m_api } } ) }, - { "licenseHeader", m_vulkanLicenseHeader }, - { "ObjectDestroy", readSnippet( "ObjectDestroy.hpp" ) }, - { "ObjectFree", readSnippet( "ObjectFree.hpp" ) }, - { "ObjectRelease", readSnippet( "ObjectRelease.hpp" ) }, - { "Optional", readSnippet( "Optional.hpp" ) }, - { "PoolFree", readSnippet( "PoolFree.hpp" ) }, - { "resultChecks", readSnippet( "resultChecks.hpp" ) }, - { "resultExceptions", generateResultExceptions() }, - { "structExtendsStructs", generateStructExtendsStructs() }, - { "ResultValue", readSnippet( "ResultValue.hpp" ) }, - { "StridedArrayProxy", readSnippet( "StridedArrayProxy.hpp" ) }, - { "StructureChain", readSnippet( "StructureChain.hpp" ) }, - { "throwResultException", generateThrowResultException() }, - { "typesafeCheck", m_typesafeCheck }, - { "UniqueHandle", readSnippet( "UniqueHandle.hpp" ) } } ); + std::string str = + replaceWithMap( vulkanHppTemplate, + { { "ArrayProxy", readSnippet( "ArrayProxy.hpp" ) }, + { "ArrayProxyNoTemporaries", readSnippet( "ArrayProxyNoTemporaries.hpp" ) }, + { "ArrayWrapper1D", readSnippet( "ArrayWrapper1D.hpp" ) }, + { "ArrayWrapper2D", readSnippet( "ArrayWrapper2D.hpp" ) }, + { "baseTypes", generateBaseTypes() }, + { "defines", readSnippet( "defines.hpp" ) }, + { "DispatchLoaderBase", readSnippet( "DispatchLoaderBase.hpp" ) }, + { "DispatchLoaderDefault", readSnippet( "DispatchLoaderDefault.hpp" ) }, + { "DispatchLoaderDynamic", generateDispatchLoaderDynamic() }, + { "DispatchLoaderStatic", generateDispatchLoaderStatic() }, + { "DynamicLoader", readSnippet( "DynamicLoader.hpp" ) }, + { "Exceptions", readSnippet( "Exceptions.hpp" ) }, + { "Flags", readSnippet( "Flags.hpp" ) }, + { "headerVersion", m_version }, + { "includes", + replaceWithMap( readSnippet( "includes.hpp" ), + { { "vulkan_h", ( m_api == "vulkan" ) ? "vulkan.h" : "vulkan_sc_core.h" }, { "vulkan_hpp", m_api + ".hpp" } } ) }, + { "licenseHeader", m_vulkanLicenseHeader }, + { "ObjectDestroy", readSnippet( "ObjectDestroy.hpp" ) }, + { "ObjectFree", readSnippet( "ObjectFree.hpp" ) }, + { "ObjectRelease", readSnippet( "ObjectRelease.hpp" ) }, + { "Optional", readSnippet( "Optional.hpp" ) }, + { "PoolFree", readSnippet( "PoolFree.hpp" ) }, + { "resultChecks", readSnippet( "resultChecks.hpp" ) }, + { "resultExceptions", generateResultExceptions() }, + { "structExtendsStructs", generateStructExtendsStructs() }, + { "ResultValue", readSnippet( "ResultValue.hpp" ) }, + { "StridedArrayProxy", readSnippet( "StridedArrayProxy.hpp" ) }, + { "StructureChain", readSnippet( "StructureChain.hpp" ) }, + { "throwResultException", generateThrowResultException() }, + { "typesafeCheck", m_typesafeCheck }, + { "UniqueHandle", readSnippet( "UniqueHandle.hpp" ) } } ); writeToFile( str, vulkan_hpp ); } diff --git a/snippets/includes.hpp b/snippets/includes.hpp index e0bf4bf..4871665 100644 --- a/snippets/includes.hpp +++ b/snippets/includes.hpp @@ -16,13 +16,13 @@ #elif 199711L < VULKAN_HPP_CPLUSPLUS # define VULKAN_HPP_CPP_VERSION 11 #else -# error "${vulkan}.hpp needs at least c++ standard version 11" +# error "${vulkan_hpp} needs at least c++ standard version 11" #endif #include #include // ArrayWrapperND #include // std::string -#include +#include #if 17 <= VULKAN_HPP_CPP_VERSION # include // std::string_view #endif diff --git a/vulkan/vulkansc.hpp b/vulkan/vulkansc.hpp index e78e27b..0f8f860 100644 --- a/vulkan/vulkansc.hpp +++ b/vulkan/vulkansc.hpp @@ -29,7 +29,7 @@ #include #include // ArrayWrapperND #include // std::string -#include +#include #if 17 <= VULKAN_HPP_CPP_VERSION # include // std::string_view #endif