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

Merge pull request #1016 from asuessenbach/cleanup

Browse Source 
Minor cleanup work.
This commit is contained in:
Andreas Süßenbach 2021-07-12 10:38:00 +02:00 committed by GitHub
commit fb8dd65e44
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 502 additions and 527 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

982
VulkanHppGenerator.cpp
View File

File diff suppressed because it is too large Load Diff

24
VulkanHppGenerator.hpp
View File

@ -28,8 +28,8 @@ public:
std::string generateBaseTypes() const; std::string generateBaseTypes() const;
std::string generateBitmasks() const; std::string generateBitmasks() const;
std::string generateCommandDefinitions() const; std::string generateCommandDefinitions() const;
std::string generateDispatchLoaderDynamic(); // uses vkGet*ProcAddress to get function pointers std::string generateDispatchLoaderDynamic() const; // uses vkGet*ProcAddress to get function pointers
std::string generateDispatchLoaderStatic(); // uses exported symbols from loader std::string generateDispatchLoaderStatic() const; // uses exported symbols from loader
std::string generateEnums() const; std::string generateEnums() const;
std::string generateHandles(); std::string generateHandles();
std::string generateHashStructures() const; std::string generateHashStructures() const;
@ -311,8 +311,7 @@ private:
void addMissingFlagBits( std::vector<std::string> & types, std::string const & referencedIn ); void addMissingFlagBits( std::vector<std::string> & types, std::string const & referencedIn );
void appendDispatchLoaderDynamicCommands( std::vector<std::string> const & commands, void appendDispatchLoaderDynamicCommands( std::vector<std::string> const & commands,
std::set<std::string> & listedCommands, std::set<std::string> & listedCommands,
std::string const & enter, std::string const & title,
std::string const & leave,
std::string & commandMembers, std::string & commandMembers,
std::string & initialCommandAssignments, std::string & initialCommandAssignments,
std::string & instanceCommandAssignments, std::string & instanceCommandAssignments,
@ -373,7 +372,6 @@ private:
std::string const & strippedParameterName, std::string const & strippedParameterName,
bool hasSizeParam, bool hasSizeParam,
bool isTemplateParam ) const; bool isTemplateParam ) const;
void appendHandle( std::string & str, std::pair<std::string, HandleData> const & handle );
void appendRAIIHandle( std::string & str, void appendRAIIHandle( std::string & str,
std::pair<std::string, HandleData> const & handle, std::pair<std::string, HandleData> const & handle,
std::set<std::string> & listedHandles, std::set<std::string> & listedHandles,
@ -381,8 +379,6 @@ private:
void appendRAIIHandleContext( std::string & str, void appendRAIIHandleContext( std::string & str,
std::pair<std::string, HandleData> const & handle, std::pair<std::string, HandleData> const & handle,
std::set<std::string> const & specialFunctions ) const; std::set<std::string> const & specialFunctions ) const;
std::pair<std::string, std::string> appendStaticCommand( std::string & str,
std::pair<std::string, CommandData> const & command );
void appendStruct( std::string & str, std::pair<std::string, StructureData> const & structure ); void appendStruct( std::string & str, std::pair<std::string, StructureData> const & structure );
void appendStructAssignmentOperators( std::string & str, void appendStructAssignmentOperators( std::string & str,
std::pair<std::string, StructureData> const & structure, std::pair<std::string, StructureData> const & structure,
@ -926,10 +922,16 @@ private:
void distributeSecondLevelCommands( std::set<std::string> const & specialFunctions ); void distributeSecondLevelCommands( std::set<std::string> const & specialFunctions );
std::string findBaseName( std::string aliasName, std::map<std::string, EnumAliasData> const & aliases ) const; std::string findBaseName( std::string aliasName, std::map<std::string, EnumAliasData> const & aliases ) const;
std::string generateBitmask( std::map<std::string, BitmaskData>::const_iterator bitmaskIt ) const; std::string generateBitmask( std::map<std::string, BitmaskData>::const_iterator bitmaskIt ) const;
std::string generateBitmasks( std::vector<std::string> const & types,
std::set<std::string> & listedBitmasks,
std::string const & title ) const;
std::string generateCommand( std::string const & name, std::string generateCommand( std::string const & name,
CommandData const & commandData, CommandData const & commandData,
size_t initialSkipCount, size_t initialSkipCount,
bool definition ) const; bool definition ) const;
std::string generateCommandDefinitions( std::vector<std::string> const & commands,
std::set<std::string> & listedCommands,
std::string const & title ) const;
std::string generateCommandDefinitions( std::string const & command, std::string const & handle ) const; std::string generateCommandDefinitions( std::string const & command, std::string const & handle ) const;
std::string generateCommandName( std::string const & vulkanCommandName, std::string generateCommandName( std::string const & vulkanCommandName,
std::vector<ParamData> const & params, std::vector<ParamData> const & params,
@ -1061,6 +1063,12 @@ private:
std::string generateDispatchLoaderDynamicCommandAssignment( std::string const & commandName, std::string generateDispatchLoaderDynamicCommandAssignment( std::string const & commandName,
CommandData const & commandData, CommandData const & commandData,
std::string const & firstArg ) const; std::string const & firstArg ) const;
std::string generateDispatchLoaderStaticCommands( std::vector<std::string> const & commands,
std::set<std::string> & listedCommands,
std::string const & title ) const;
std::string generateEnums( std::vector<std::string> const & enums,
std::set<std::string> & listedEnums,
std::string const & title ) const;
std::string generateFunctionCall( std::string const & name, std::string generateFunctionCall( std::string const & name,
CommandData const & commandData, CommandData const & commandData,
size_t returnParamIndex, size_t returnParamIndex,
@ -1068,6 +1076,7 @@ private:
std::map<size_t, size_t> const & vectorParamIndices, std::map<size_t, size_t> const & vectorParamIndices,
bool twoStep, bool twoStep,
bool firstCall ) const; bool firstCall ) const;
std::string generateHandle( std::pair<std::string, HandleData> const & handle );
std::string std::string
generateLenInitializer( std::vector<MemberData>::const_iterator mit, generateLenInitializer( std::vector<MemberData>::const_iterator mit,
std::map<std::vector<MemberData>::const_iterator, std::map<std::vector<MemberData>::const_iterator,
@ -1198,7 +1207,6 @@ private:
std::map<std::string, HandleData> m_handles; std::map<std::string, HandleData> m_handles;
std::set<std::string> m_includes; std::set<std::string> m_includes;
std::set<std::string> m_listedTypes; std::set<std::string> m_listedTypes;
std::set<std::string> m_listingTypes;
std::map<std::string, PlatformData> m_platforms; std::map<std::string, PlatformData> m_platforms;
std::set<std::string> m_RAIISpecialFunctions; std::set<std::string> m_RAIISpecialFunctions;
std::map<std::string, StructureAliasData> m_structureAliases; std::map<std::string, StructureAliasData> m_structureAliases;

1
vulkan/vulkan.hpp
View File

@ -5732,6 +5732,7 @@ namespace VULKAN_HPP_NAMESPACE
using DeviceSize = uint64_t; using DeviceSize = uint64_t;
using RemoteAddressNV = void *; using RemoteAddressNV = void *;
using SampleMask = uint32_t; using SampleMask = uint32_t;
} // namespace VULKAN_HPP_NAMESPACE } // namespace VULKAN_HPP_NAMESPACE
#include <vulkan/vulkan_enums.hpp> #include <vulkan/vulkan_enums.hpp>