mirror/Vulkan-Hpp
1
0
Fork 0
mirror of https://github.com/KhronosGroup/Vulkan-Hpp.git synced 2024-10-14 16:32:17 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Adjust name of included vulkan header. (#1527)

Browse Source
This commit is contained in:
Andreas Süßenbach 2023-03-08 10:10:54 +01:00 committed by GitHub
parent da4ab05a14
commit 9bee68b723
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 37 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
VulkanHppGenerator.cpp
View File

@ -321,37 +321,40 @@ ${DispatchLoaderDynamic}
#endif #endif
)"; )";
std::string str = replaceWithMap( vulkanHppTemplate, std::string str =
{ { "ArrayProxy", readSnippet( "ArrayProxy.hpp" ) }, replaceWithMap( vulkanHppTemplate,
{ "ArrayProxyNoTemporaries", readSnippet( "ArrayProxyNoTemporaries.hpp" ) }, { { "ArrayProxy", readSnippet( "ArrayProxy.hpp" ) },
{ "ArrayWrapper1D", readSnippet( "ArrayWrapper1D.hpp" ) }, { "ArrayProxyNoTemporaries", readSnippet( "ArrayProxyNoTemporaries.hpp" ) },
{ "ArrayWrapper2D", readSnippet( "ArrayWrapper2D.hpp" ) }, { "ArrayWrapper1D", readSnippet( "ArrayWrapper1D.hpp" ) },
{ "baseTypes", generateBaseTypes() }, { "ArrayWrapper2D", readSnippet( "ArrayWrapper2D.hpp" ) },
{ "defines", readSnippet( "defines.hpp" ) }, { "baseTypes", generateBaseTypes() },
{ "DispatchLoaderBase", readSnippet( "DispatchLoaderBase.hpp" ) }, { "defines", readSnippet( "defines.hpp" ) },
{ "DispatchLoaderDefault", readSnippet( "DispatchLoaderDefault.hpp" ) }, { "DispatchLoaderBase", readSnippet( "DispatchLoaderBase.hpp" ) },
{ "DispatchLoaderDynamic", generateDispatchLoaderDynamic() }, { "DispatchLoaderDefault", readSnippet( "DispatchLoaderDefault.hpp" ) },
{ "DispatchLoaderStatic", generateDispatchLoaderStatic() }, { "DispatchLoaderDynamic", generateDispatchLoaderDynamic() },
{ "DynamicLoader", readSnippet( "DynamicLoader.hpp" ) }, { "DispatchLoaderStatic", generateDispatchLoaderStatic() },
{ "Exceptions", readSnippet( "Exceptions.hpp" ) }, { "DynamicLoader", readSnippet( "DynamicLoader.hpp" ) },
{ "Flags", readSnippet( "Flags.hpp" ) }, { "Exceptions", readSnippet( "Exceptions.hpp" ) },
{ "headerVersion", m_version }, { "Flags", readSnippet( "Flags.hpp" ) },
{ "includes", replaceWithMap( readSnippet( "includes.hpp" ), { { "vulkan", m_api } } ) }, { "headerVersion", m_version },
{ "licenseHeader", m_vulkanLicenseHeader }, { "includes",
{ "ObjectDestroy", readSnippet( "ObjectDestroy.hpp" ) }, replaceWithMap( readSnippet( "includes.hpp" ),
{ "ObjectFree", readSnippet( "ObjectFree.hpp" ) }, { { "vulkan_h", ( m_api == "vulkan" ) ? "vulkan.h" : "vulkan_sc_core.h" }, { "vulkan_hpp", m_api + ".hpp" } } ) },
{ "ObjectRelease", readSnippet( "ObjectRelease.hpp" ) }, { "licenseHeader", m_vulkanLicenseHeader },
{ "Optional", readSnippet( "Optional.hpp" ) }, { "ObjectDestroy", readSnippet( "ObjectDestroy.hpp" ) },
{ "PoolFree", readSnippet( "PoolFree.hpp" ) }, { "ObjectFree", readSnippet( "ObjectFree.hpp" ) },
{ "resultChecks", readSnippet( "resultChecks.hpp" ) }, { "ObjectRelease", readSnippet( "ObjectRelease.hpp" ) },
{ "resultExceptions", generateResultExceptions() }, { "Optional", readSnippet( "Optional.hpp" ) },
{ "structExtendsStructs", generateStructExtendsStructs() }, { "PoolFree", readSnippet( "PoolFree.hpp" ) },
{ "ResultValue", readSnippet( "ResultValue.hpp" ) }, { "resultChecks", readSnippet( "resultChecks.hpp" ) },
{ "StridedArrayProxy", readSnippet( "StridedArrayProxy.hpp" ) }, { "resultExceptions", generateResultExceptions() },
{ "StructureChain", readSnippet( "StructureChain.hpp" ) }, { "structExtendsStructs", generateStructExtendsStructs() },
{ "throwResultException", generateThrowResultException() }, { "ResultValue", readSnippet( "ResultValue.hpp" ) },
{ "typesafeCheck", m_typesafeCheck }, { "StridedArrayProxy", readSnippet( "StridedArrayProxy.hpp" ) },
{ "UniqueHandle", readSnippet( "UniqueHandle.hpp" ) } } ); { "StructureChain", readSnippet( "StructureChain.hpp" ) },
{ "throwResultException", generateThrowResultException() },
{ "typesafeCheck", m_typesafeCheck },
{ "UniqueHandle", readSnippet( "UniqueHandle.hpp" ) } } );
writeToFile( str, vulkan_hpp ); writeToFile( str, vulkan_hpp );
} }

4
snippets/includes.hpp
View File

@ -16,13 +16,13 @@
#elif 199711L < VULKAN_HPP_CPLUSPLUS #elif 199711L < VULKAN_HPP_CPLUSPLUS
# define VULKAN_HPP_CPP_VERSION 11 # define VULKAN_HPP_CPP_VERSION 11
#else #else
# error "${vulkan}.hpp needs at least c++ standard version 11" # error "${vulkan_hpp} needs at least c++ standard version 11"
#endif #endif
#include <algorithm> #include <algorithm>
#include <array> // ArrayWrapperND #include <array> // ArrayWrapperND
#include <string> // std::string #include <string> // std::string
#include <vulkan/${vulkan}.h> #include <vulkan/${vulkan_h}>
#if 17 <= VULKAN_HPP_CPP_VERSION #if 17 <= VULKAN_HPP_CPP_VERSION
# include <string_view> // std::string_view # include <string_view> // std::string_view
#endif #endif

2
vulkan/vulkansc.hpp
View File

@ -29,7 +29,7 @@
#include <algorithm> #include <algorithm>
#include <array> // ArrayWrapperND #include <array> // ArrayWrapperND
#include <string> // std::string #include <string> // std::string
#include <vulkan/vulkansc.h> #include <vulkan/vulkan_sc_core.h>
#if 17 <= VULKAN_HPP_CPP_VERSION #if 17 <= VULKAN_HPP_CPP_VERSION
# include <string_view> // std::string_view # include <string_view> // std::string_view
#endif #endif