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

Reshape alias handling according to new alias usage in vk.xml. (#167)

Browse Source
This commit is contained in:
Andreas Süßenbach 2018-01-04 10:51:17 +01:00 committed by Markus Tavenrath
parent 15ac21442d
commit c4fcc08e95
3 changed files with 430 additions and 465 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

783
VulkanHppGenerator.cpp
View File

File diff suppressed because it is too large Load Diff

42
VulkanHppGenerator.hpp
View File

@ -27,7 +27,7 @@ class VulkanHppGenerator
public:
VulkanHppGenerator()
{
m_handles[""]; // insert the default "handle" without class (for createInstance, and such)
m_handles.insert(std::make_pair("", HandleData())); // insert the default "handle" without class (for createInstance, and such)
}
std::map<std::string, std::string> createDefaults();
@ -52,14 +52,19 @@ class VulkanHppGenerator
#endif
private:
struct BitmaskData
{
std::string protect;
std::string alias;
};
struct DependencyData
{
enum class Category
{
ALIAS,
BITMASK,
COMMAND,
ENUM,
FLAGS,
FUNC_POINTER,
HANDLE,
REQUIRED,
@ -79,19 +84,6 @@ class VulkanHppGenerator
std::set<std::string> forwardDependencies;
};
struct AliasData
{
AliasData(DependencyData::Category c, std::string const& v, std::string const& p)
: category(c)
, value(v)
, protect(p)
{}
DependencyData::Category category;
std::string value;
std::string protect;
};
struct ParamData
{
std::string type;
@ -155,12 +147,6 @@ class VulkanHppGenerator
bool bitmask;
};
struct FlagData
{
std::string protect;
std::string alias;
};
struct HandleData
{
std::vector<std::string> commands;
@ -193,6 +179,7 @@ class VulkanHppGenerator
std::vector<MemberData> members;
std::string protect;
std::vector<std::string> structExtends;
std::string alias;
};
#if !defined(NDEBUG)
@ -211,7 +198,7 @@ class VulkanHppGenerator
#endif
private:
void aliasType(DependencyData::Category category, std::string const& aliasName, std::string const& newName, std::string const& protect);
template <typename T> void checkAlias(std::map<std::string, T> const& data, std::string const& name, int line);
bool containsUnion(std::string const& type, std::map<std::string, StructData> const& structs);
void determineEnhancedReturnType(CommandData & commandData);
void determineReducedName(CommandData & commandData);
@ -228,7 +215,6 @@ class VulkanHppGenerator
void readDisabledExtensionRequire(tinyxml2::XMLElement const* element);
void readEnumsEnum(tinyxml2::XMLElement const* element, EnumData & enumData, std::string const& tag);
void readEnumsConstant(tinyxml2::XMLElement const* element);
void readExtensionAlias(tinyxml2::XMLElement const* element, std::string const& protect, std::string const& tag);
void readExtensionCommand(tinyxml2::XMLElement const* element, std::string const& protect);
void readExtensionEnum(tinyxml2::XMLElement const* element, std::string const& tag);
void readExtensionRequire(tinyxml2::XMLElement const* element, std::string const& protect, std::string const& tag);
@ -248,6 +234,7 @@ class VulkanHppGenerator
void readTypeStructMember(tinyxml2::XMLElement const* element, StructData & structData);
void registerDeleter(CommandData const& commandData);
void setDefault(std::string const& name, std::map<std::string, std::string> & defaultValues, EnumData const& enumData);
void writeBitmaskToString(std::ostream & os, std::string const& flagsName, EnumData const &enumData);
void writeCall(std::ostream & os, CommandData const& commandData, bool firstCall, bool singular);
void writeCallCountParameter(std::ostream & os, CommandData const& commandData, bool singular, std::map<size_t, size_t>::const_iterator it);
void writeCallPlainTypeParameter(std::ostream & os, ParamData const& paramData);
@ -257,7 +244,6 @@ class VulkanHppGenerator
void writeDeleterClasses(std::ostream & os, std::pair<std::string, std::set<std::string>> const& deleterTypes);
void writeDeleterForwardDeclarations(std::ostream &os, std::pair<std::string, std::set<std::string>> const& deleterTypes);
void writeExceptionsForEnum(std::ostream & os, EnumData const& enumData);
void writeFlagsToString(std::ostream & os, std::string const& flagsName, EnumData const &enumData);
void writeFunction(std::ostream & os, std::string const& indentation, CommandData const& commandData, bool definition, bool enhanced, bool singular, bool unique, bool isStructureChain);
void writeFunctionBodyEnhanced(std::ostream & os, std::string const& indentation, CommandData const& commandData, bool singular, bool isStructureChain);
void writeFunctionBodyEnhanced(std::ostream & os, std::string const& templateString, std::string const& indentation, CommandData const& commandData, bool singular);
@ -282,11 +268,10 @@ class VulkanHppGenerator
void writeStructSetter(std::ostream & os, std::string const& structureName, MemberData const& memberData);
void writeStructureChainValidation(std::ostream & os, DependencyData const& dependencyData);
void writeThrowExceptions(std::ostream& os, EnumData const& enumData);
void writeTypeAlias(std::ostream & os, DependencyData const& dependencyData);
void writeTypeBitmask(std::ostream & os, std::string const& flagsName, BitmaskData const& bitmaskData, EnumData const& enumData);
void writeTypeCommand(std::ostream & os, DependencyData const& dependencyData);
void writeTypeCommand(std::ostream &os, std::string const& indentation, CommandData const& commandData, bool definition);
void writeTypeEnum(std::ostream & os, EnumData const& enumData);
void writeTypeFlags(std::ostream & os, std::string const& flagsName, FlagData const& flagData, EnumData const& enumData);
void writeTypeHandle(std::ostream & os, DependencyData const& dependencyData, HandleData const& handle);
void writeTypeScalar(std::ostream & os, DependencyData const& dependencyData);
void writeTypeStruct(std::ostream & os, DependencyData const& dependencyData, std::map<std::string, std::string> const& defaultValues);
@ -296,7 +281,7 @@ class VulkanHppGenerator
#endif
private:
std::map<std::string, AliasData> m_aliases;
std::map<std::string, BitmaskData> m_bitmasks;
std::map<std::string, CommandData> m_commands;
std::map<std::string, std::string> m_constants;
std::set<std::string> m_defines;
@ -305,7 +290,6 @@ class VulkanHppGenerator
std::list<DependencyData> m_dependencies;
std::map<std::string, EnumData> m_enums;
std::set<std::string> m_extendedStructs; // structs which are referenced by the structextends tag
std::map<std::string, FlagData> m_flags;
std::map<std::string, HandleData> m_handles;
std::map<std::string, std::string> m_nameMap;
std::map<std::string, ScalarData> m_scalars;

70
vulkan/vulkan.hpp
View File

@ -1265,7 +1265,7 @@ namespace VULKAN_HPP_NAMESPACE
{}
VULKAN_HPP_TYPESAFE_EXPLICIT DeviceMemory( VkDeviceMemory deviceMemory )
: m_deviceMemory( deviceMemory )
: m_deviceMemory( deviceMemory )
{}
#if defined(VULKAN_HPP_TYPESAFE_CONVERSION)
@ -1332,7 +1332,7 @@ namespace VULKAN_HPP_NAMESPACE
{}
VULKAN_HPP_TYPESAFE_EXPLICIT CommandPool( VkCommandPool commandPool )
: m_commandPool( commandPool )
: m_commandPool( commandPool )
{}
#if defined(VULKAN_HPP_TYPESAFE_CONVERSION)
@ -1399,7 +1399,7 @@ namespace VULKAN_HPP_NAMESPACE
{}
VULKAN_HPP_TYPESAFE_EXPLICIT Buffer( VkBuffer buffer )
: m_buffer( buffer )
: m_buffer( buffer )
{}
#if defined(VULKAN_HPP_TYPESAFE_CONVERSION)
@ -1466,7 +1466,7 @@ namespace VULKAN_HPP_NAMESPACE
{}
VULKAN_HPP_TYPESAFE_EXPLICIT BufferView( VkBufferView bufferView )
: m_bufferView( bufferView )
: m_bufferView( bufferView )
{}
#if defined(VULKAN_HPP_TYPESAFE_CONVERSION)
@ -1533,7 +1533,7 @@ namespace VULKAN_HPP_NAMESPACE
{}
VULKAN_HPP_TYPESAFE_EXPLICIT Image( VkImage image )
: m_image( image )
: m_image( image )
{}
#if defined(VULKAN_HPP_TYPESAFE_CONVERSION)
@ -1600,7 +1600,7 @@ namespace VULKAN_HPP_NAMESPACE
{}
VULKAN_HPP_TYPESAFE_EXPLICIT ImageView( VkImageView imageView )
: m_imageView( imageView )
: m_imageView( imageView )
{}
#if defined(VULKAN_HPP_TYPESAFE_CONVERSION)
@ -1667,7 +1667,7 @@ namespace VULKAN_HPP_NAMESPACE
{}
VULKAN_HPP_TYPESAFE_EXPLICIT ShaderModule( VkShaderModule shaderModule )
: m_shaderModule( shaderModule )
: m_shaderModule( shaderModule )
{}
#if defined(VULKAN_HPP_TYPESAFE_CONVERSION)
@ -1734,7 +1734,7 @@ namespace VULKAN_HPP_NAMESPACE
{}
VULKAN_HPP_TYPESAFE_EXPLICIT Pipeline( VkPipeline pipeline )
: m_pipeline( pipeline )
: m_pipeline( pipeline )
{}
#if defined(VULKAN_HPP_TYPESAFE_CONVERSION)
@ -1801,7 +1801,7 @@ namespace VULKAN_HPP_NAMESPACE
{}
VULKAN_HPP_TYPESAFE_EXPLICIT PipelineLayout( VkPipelineLayout pipelineLayout )
: m_pipelineLayout( pipelineLayout )
: m_pipelineLayout( pipelineLayout )
{}
#if defined(VULKAN_HPP_TYPESAFE_CONVERSION)
@ -1868,7 +1868,7 @@ namespace VULKAN_HPP_NAMESPACE
{}
VULKAN_HPP_TYPESAFE_EXPLICIT Sampler( VkSampler sampler )
: m_sampler( sampler )
: m_sampler( sampler )
{}
#if defined(VULKAN_HPP_TYPESAFE_CONVERSION)
@ -1935,7 +1935,7 @@ namespace VULKAN_HPP_NAMESPACE
{}
VULKAN_HPP_TYPESAFE_EXPLICIT DescriptorSet( VkDescriptorSet descriptorSet )
: m_descriptorSet( descriptorSet )
: m_descriptorSet( descriptorSet )
{}
#if defined(VULKAN_HPP_TYPESAFE_CONVERSION)
@ -2002,7 +2002,7 @@ namespace VULKAN_HPP_NAMESPACE
{}
VULKAN_HPP_TYPESAFE_EXPLICIT DescriptorSetLayout( VkDescriptorSetLayout descriptorSetLayout )
: m_descriptorSetLayout( descriptorSetLayout )
: m_descriptorSetLayout( descriptorSetLayout )
{}
#if defined(VULKAN_HPP_TYPESAFE_CONVERSION)
@ -2069,7 +2069,7 @@ namespace VULKAN_HPP_NAMESPACE
{}
VULKAN_HPP_TYPESAFE_EXPLICIT DescriptorPool( VkDescriptorPool descriptorPool )
: m_descriptorPool( descriptorPool )
: m_descriptorPool( descriptorPool )
{}
#if defined(VULKAN_HPP_TYPESAFE_CONVERSION)
@ -2136,7 +2136,7 @@ namespace VULKAN_HPP_NAMESPACE
{}
VULKAN_HPP_TYPESAFE_EXPLICIT Fence( VkFence fence )
: m_fence( fence )
: m_fence( fence )
{}
#if defined(VULKAN_HPP_TYPESAFE_CONVERSION)
@ -2203,7 +2203,7 @@ namespace VULKAN_HPP_NAMESPACE
{}
VULKAN_HPP_TYPESAFE_EXPLICIT Semaphore( VkSemaphore semaphore )
: m_semaphore( semaphore )
: m_semaphore( semaphore )
{}
#if defined(VULKAN_HPP_TYPESAFE_CONVERSION)
@ -2270,7 +2270,7 @@ namespace VULKAN_HPP_NAMESPACE
{}
VULKAN_HPP_TYPESAFE_EXPLICIT Event( VkEvent event )
: m_event( event )
: m_event( event )
{}
#if defined(VULKAN_HPP_TYPESAFE_CONVERSION)
@ -2337,7 +2337,7 @@ namespace VULKAN_HPP_NAMESPACE
{}
VULKAN_HPP_TYPESAFE_EXPLICIT QueryPool( VkQueryPool queryPool )
: m_queryPool( queryPool )
: m_queryPool( queryPool )
{}
#if defined(VULKAN_HPP_TYPESAFE_CONVERSION)
@ -2404,7 +2404,7 @@ namespace VULKAN_HPP_NAMESPACE
{}
VULKAN_HPP_TYPESAFE_EXPLICIT Framebuffer( VkFramebuffer framebuffer )
: m_framebuffer( framebuffer )
: m_framebuffer( framebuffer )
{}
#if defined(VULKAN_HPP_TYPESAFE_CONVERSION)
@ -2471,7 +2471,7 @@ namespace VULKAN_HPP_NAMESPACE
{}
VULKAN_HPP_TYPESAFE_EXPLICIT RenderPass( VkRenderPass renderPass )
: m_renderPass( renderPass )
: m_renderPass( renderPass )
{}
#if defined(VULKAN_HPP_TYPESAFE_CONVERSION)
@ -2538,7 +2538,7 @@ namespace VULKAN_HPP_NAMESPACE
{}
VULKAN_HPP_TYPESAFE_EXPLICIT PipelineCache( VkPipelineCache pipelineCache )
: m_pipelineCache( pipelineCache )
: m_pipelineCache( pipelineCache )
{}
#if defined(VULKAN_HPP_TYPESAFE_CONVERSION)
@ -2605,7 +2605,7 @@ namespace VULKAN_HPP_NAMESPACE
{}
VULKAN_HPP_TYPESAFE_EXPLICIT ObjectTableNVX( VkObjectTableNVX objectTableNVX )
: m_objectTableNVX( objectTableNVX )
: m_objectTableNVX( objectTableNVX )
{}
#if defined(VULKAN_HPP_TYPESAFE_CONVERSION)
@ -2672,7 +2672,7 @@ namespace VULKAN_HPP_NAMESPACE
{}
VULKAN_HPP_TYPESAFE_EXPLICIT IndirectCommandsLayoutNVX( VkIndirectCommandsLayoutNVX indirectCommandsLayoutNVX )
: m_indirectCommandsLayoutNVX( indirectCommandsLayoutNVX )
: m_indirectCommandsLayoutNVX( indirectCommandsLayoutNVX )
{}
#if defined(VULKAN_HPP_TYPESAFE_CONVERSION)
@ -2739,7 +2739,7 @@ namespace VULKAN_HPP_NAMESPACE
{}
VULKAN_HPP_TYPESAFE_EXPLICIT DescriptorUpdateTemplateKHR( VkDescriptorUpdateTemplateKHR descriptorUpdateTemplateKHR )
: m_descriptorUpdateTemplateKHR( descriptorUpdateTemplateKHR )
: m_descriptorUpdateTemplateKHR( descriptorUpdateTemplateKHR )
{}
#if defined(VULKAN_HPP_TYPESAFE_CONVERSION)
@ -2806,7 +2806,7 @@ namespace VULKAN_HPP_NAMESPACE
{}
VULKAN_HPP_TYPESAFE_EXPLICIT SamplerYcbcrConversionKHR( VkSamplerYcbcrConversionKHR samplerYcbcrConversionKHR )
: m_samplerYcbcrConversionKHR( samplerYcbcrConversionKHR )
: m_samplerYcbcrConversionKHR( samplerYcbcrConversionKHR )
{}
#if defined(VULKAN_HPP_TYPESAFE_CONVERSION)
@ -2873,7 +2873,7 @@ namespace VULKAN_HPP_NAMESPACE
{}
VULKAN_HPP_TYPESAFE_EXPLICIT ValidationCacheEXT( VkValidationCacheEXT validationCacheEXT )
: m_validationCacheEXT( validationCacheEXT )
: m_validationCacheEXT( validationCacheEXT )
{}
#if defined(VULKAN_HPP_TYPESAFE_CONVERSION)
@ -2940,7 +2940,7 @@ namespace VULKAN_HPP_NAMESPACE
{}
VULKAN_HPP_TYPESAFE_EXPLICIT DisplayKHR( VkDisplayKHR displayKHR )
: m_displayKHR( displayKHR )
: m_displayKHR( displayKHR )
{}
#if defined(VULKAN_HPP_TYPESAFE_CONVERSION)
@ -3007,7 +3007,7 @@ namespace VULKAN_HPP_NAMESPACE
{}
VULKAN_HPP_TYPESAFE_EXPLICIT DisplayModeKHR( VkDisplayModeKHR displayModeKHR )
: m_displayModeKHR( displayModeKHR )
: m_displayModeKHR( displayModeKHR )
{}
#if defined(VULKAN_HPP_TYPESAFE_CONVERSION)
@ -3074,7 +3074,7 @@ namespace VULKAN_HPP_NAMESPACE
{}
VULKAN_HPP_TYPESAFE_EXPLICIT SurfaceKHR( VkSurfaceKHR surfaceKHR )
: m_surfaceKHR( surfaceKHR )
: m_surfaceKHR( surfaceKHR )
{}
#if defined(VULKAN_HPP_TYPESAFE_CONVERSION)
@ -3141,7 +3141,7 @@ namespace VULKAN_HPP_NAMESPACE
{}
VULKAN_HPP_TYPESAFE_EXPLICIT SwapchainKHR( VkSwapchainKHR swapchainKHR )
: m_swapchainKHR( swapchainKHR )
: m_swapchainKHR( swapchainKHR )
{}
#if defined(VULKAN_HPP_TYPESAFE_CONVERSION)
@ -3208,7 +3208,7 @@ namespace VULKAN_HPP_NAMESPACE
{}
VULKAN_HPP_TYPESAFE_EXPLICIT DebugReportCallbackEXT( VkDebugReportCallbackEXT debugReportCallbackEXT )
: m_debugReportCallbackEXT( debugReportCallbackEXT )
: m_debugReportCallbackEXT( debugReportCallbackEXT )
{}
#if defined(VULKAN_HPP_TYPESAFE_CONVERSION)
@ -26802,7 +26802,7 @@ namespace VULKAN_HPP_NAMESPACE
{}
VULKAN_HPP_TYPESAFE_EXPLICIT CommandBuffer( VkCommandBuffer commandBuffer )
: m_commandBuffer( commandBuffer )
: m_commandBuffer( commandBuffer )
{}
#if defined(VULKAN_HPP_TYPESAFE_CONVERSION)
@ -27696,7 +27696,7 @@ namespace VULKAN_HPP_NAMESPACE
{}
VULKAN_HPP_TYPESAFE_EXPLICIT Queue( VkQueue queue )
: m_queue( queue )
: m_queue( queue )
{}
#if defined(VULKAN_HPP_TYPESAFE_CONVERSION)
@ -27917,7 +27917,7 @@ namespace VULKAN_HPP_NAMESPACE
{}
VULKAN_HPP_TYPESAFE_EXPLICIT Device( VkDevice device )
: m_device( device )
: m_device( device )
{}
#if defined(VULKAN_HPP_TYPESAFE_CONVERSION)
@ -31276,7 +31276,7 @@ namespace VULKAN_HPP_NAMESPACE
{}
VULKAN_HPP_TYPESAFE_EXPLICIT PhysicalDevice( VkPhysicalDevice physicalDevice )
: m_physicalDevice( physicalDevice )
: m_physicalDevice( physicalDevice )
{}
#if defined(VULKAN_HPP_TYPESAFE_CONVERSION)
@ -32589,7 +32589,7 @@ namespace VULKAN_HPP_NAMESPACE
{}
VULKAN_HPP_TYPESAFE_EXPLICIT Instance( VkInstance instance )
: m_instance( instance )
: m_instance( instance )
{}
#if defined(VULKAN_HPP_TYPESAFE_CONVERSION)