From 096e555640308efa86605dd4e51d74d63b11a6f0 Mon Sep 17 00:00:00 2001
From: Janeczko Jakub <kuba@ev1.pl>
Date: Mon, 15 Jul 2024 12:39:19 +0200
Subject: [PATCH] Add alias bitmasks to module interface (#1917)

* add alias bitmasks to c++ module

* generate code

* format
---
 VulkanHppGenerator.cpp |  4 ++++
 vulkan/vulkan.cppm     | 26 ++++++++++++++++++++++++++
 vulkan/vulkansc.cppm   | 21 +++++++++++++++++++++
 3 files changed, 51 insertions(+)

diff --git a/VulkanHppGenerator.cpp b/VulkanHppGenerator.cpp
index a4f7406..906972d 100644
--- a/VulkanHppGenerator.cpp
+++ b/VulkanHppGenerator.cpp
@@ -5649,6 +5649,10 @@ std::string VulkanHppGenerator::generateCppModuleEnumUsings() const
                bitmaskIt != m_bitmasks.end() )
           {
             localUsings += replaceWithMap( usingTemplate, { { "enumName", stripPrefix( bitmaskIt->first, "Vk" ) } } );
+            for ( auto const & alias : bitmaskIt->second.aliases )
+            {
+              localUsings += replaceWithMap( usingTemplate, { { "enumName", stripPrefix( alias.first, "Vk" ) } } );
+            }
           }
         }
       }
diff --git a/vulkan/vulkan.cppm b/vulkan/vulkan.cppm
index 1baba36..d3aad8a 100644
--- a/vulkan/vulkan.cppm
+++ b/vulkan/vulkan.cppm
@@ -236,37 +236,48 @@ export namespace VULKAN_HPP_NAMESPACE
   using VULKAN_HPP_NAMESPACE::ChromaLocationKHR;
   using VULKAN_HPP_NAMESPACE::CommandPoolTrimFlagBits;
   using VULKAN_HPP_NAMESPACE::CommandPoolTrimFlags;
+  using VULKAN_HPP_NAMESPACE::CommandPoolTrimFlagsKHR;
   using VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplateCreateFlagBits;
   using VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplateCreateFlags;
+  using VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplateCreateFlagsKHR;
   using VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplateType;
   using VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplateTypeKHR;
   using VULKAN_HPP_NAMESPACE::ExternalFenceFeatureFlagBits;
   using VULKAN_HPP_NAMESPACE::ExternalFenceFeatureFlagBitsKHR;
   using VULKAN_HPP_NAMESPACE::ExternalFenceFeatureFlags;
+  using VULKAN_HPP_NAMESPACE::ExternalFenceFeatureFlagsKHR;
   using VULKAN_HPP_NAMESPACE::ExternalFenceHandleTypeFlagBits;
   using VULKAN_HPP_NAMESPACE::ExternalFenceHandleTypeFlagBitsKHR;
   using VULKAN_HPP_NAMESPACE::ExternalFenceHandleTypeFlags;
+  using VULKAN_HPP_NAMESPACE::ExternalFenceHandleTypeFlagsKHR;
   using VULKAN_HPP_NAMESPACE::ExternalMemoryFeatureFlagBits;
   using VULKAN_HPP_NAMESPACE::ExternalMemoryFeatureFlagBitsKHR;
   using VULKAN_HPP_NAMESPACE::ExternalMemoryFeatureFlags;
+  using VULKAN_HPP_NAMESPACE::ExternalMemoryFeatureFlagsKHR;
   using VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits;
   using VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBitsKHR;
   using VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlags;
+  using VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagsKHR;
   using VULKAN_HPP_NAMESPACE::ExternalSemaphoreFeatureFlagBits;
   using VULKAN_HPP_NAMESPACE::ExternalSemaphoreFeatureFlagBitsKHR;
   using VULKAN_HPP_NAMESPACE::ExternalSemaphoreFeatureFlags;
+  using VULKAN_HPP_NAMESPACE::ExternalSemaphoreFeatureFlagsKHR;
   using VULKAN_HPP_NAMESPACE::ExternalSemaphoreHandleTypeFlagBits;
   using VULKAN_HPP_NAMESPACE::ExternalSemaphoreHandleTypeFlagBitsKHR;
   using VULKAN_HPP_NAMESPACE::ExternalSemaphoreHandleTypeFlags;
+  using VULKAN_HPP_NAMESPACE::ExternalSemaphoreHandleTypeFlagsKHR;
   using VULKAN_HPP_NAMESPACE::FenceImportFlagBits;
   using VULKAN_HPP_NAMESPACE::FenceImportFlagBitsKHR;
   using VULKAN_HPP_NAMESPACE::FenceImportFlags;
+  using VULKAN_HPP_NAMESPACE::FenceImportFlagsKHR;
   using VULKAN_HPP_NAMESPACE::MemoryAllocateFlagBits;
   using VULKAN_HPP_NAMESPACE::MemoryAllocateFlagBitsKHR;
   using VULKAN_HPP_NAMESPACE::MemoryAllocateFlags;
+  using VULKAN_HPP_NAMESPACE::MemoryAllocateFlagsKHR;
   using VULKAN_HPP_NAMESPACE::PeerMemoryFeatureFlagBits;
   using VULKAN_HPP_NAMESPACE::PeerMemoryFeatureFlagBitsKHR;
   using VULKAN_HPP_NAMESPACE::PeerMemoryFeatureFlags;
+  using VULKAN_HPP_NAMESPACE::PeerMemoryFeatureFlagsKHR;
   using VULKAN_HPP_NAMESPACE::PointClippingBehavior;
   using VULKAN_HPP_NAMESPACE::PointClippingBehaviorKHR;
   using VULKAN_HPP_NAMESPACE::SamplerYcbcrModelConversion;
@@ -276,6 +287,7 @@ export namespace VULKAN_HPP_NAMESPACE
   using VULKAN_HPP_NAMESPACE::SemaphoreImportFlagBits;
   using VULKAN_HPP_NAMESPACE::SemaphoreImportFlagBitsKHR;
   using VULKAN_HPP_NAMESPACE::SemaphoreImportFlags;
+  using VULKAN_HPP_NAMESPACE::SemaphoreImportFlagsKHR;
   using VULKAN_HPP_NAMESPACE::SubgroupFeatureFlagBits;
   using VULKAN_HPP_NAMESPACE::SubgroupFeatureFlags;
   using VULKAN_HPP_NAMESPACE::TessellationDomainOrigin;
@@ -285,11 +297,13 @@ export namespace VULKAN_HPP_NAMESPACE
   using VULKAN_HPP_NAMESPACE::DescriptorBindingFlagBits;
   using VULKAN_HPP_NAMESPACE::DescriptorBindingFlagBitsEXT;
   using VULKAN_HPP_NAMESPACE::DescriptorBindingFlags;
+  using VULKAN_HPP_NAMESPACE::DescriptorBindingFlagsEXT;
   using VULKAN_HPP_NAMESPACE::DriverId;
   using VULKAN_HPP_NAMESPACE::DriverIdKHR;
   using VULKAN_HPP_NAMESPACE::ResolveModeFlagBits;
   using VULKAN_HPP_NAMESPACE::ResolveModeFlagBitsKHR;
   using VULKAN_HPP_NAMESPACE::ResolveModeFlags;
+  using VULKAN_HPP_NAMESPACE::ResolveModeFlagsKHR;
   using VULKAN_HPP_NAMESPACE::SamplerReductionMode;
   using VULKAN_HPP_NAMESPACE::SamplerReductionModeEXT;
   using VULKAN_HPP_NAMESPACE::SemaphoreType;
@@ -297,6 +311,7 @@ export namespace VULKAN_HPP_NAMESPACE
   using VULKAN_HPP_NAMESPACE::SemaphoreWaitFlagBits;
   using VULKAN_HPP_NAMESPACE::SemaphoreWaitFlagBitsKHR;
   using VULKAN_HPP_NAMESPACE::SemaphoreWaitFlags;
+  using VULKAN_HPP_NAMESPACE::SemaphoreWaitFlagsKHR;
   using VULKAN_HPP_NAMESPACE::ShaderFloatControlsIndependence;
   using VULKAN_HPP_NAMESPACE::ShaderFloatControlsIndependenceKHR;
 
@@ -304,27 +319,35 @@ export namespace VULKAN_HPP_NAMESPACE
   using VULKAN_HPP_NAMESPACE::AccessFlagBits2;
   using VULKAN_HPP_NAMESPACE::AccessFlagBits2KHR;
   using VULKAN_HPP_NAMESPACE::AccessFlags2;
+  using VULKAN_HPP_NAMESPACE::AccessFlags2KHR;
   using VULKAN_HPP_NAMESPACE::FormatFeatureFlagBits2;
   using VULKAN_HPP_NAMESPACE::FormatFeatureFlagBits2KHR;
   using VULKAN_HPP_NAMESPACE::FormatFeatureFlags2;
+  using VULKAN_HPP_NAMESPACE::FormatFeatureFlags2KHR;
   using VULKAN_HPP_NAMESPACE::PipelineCreationFeedbackFlagBits;
   using VULKAN_HPP_NAMESPACE::PipelineCreationFeedbackFlagBitsEXT;
   using VULKAN_HPP_NAMESPACE::PipelineCreationFeedbackFlags;
+  using VULKAN_HPP_NAMESPACE::PipelineCreationFeedbackFlagsEXT;
   using VULKAN_HPP_NAMESPACE::PipelineStageFlagBits2;
   using VULKAN_HPP_NAMESPACE::PipelineStageFlagBits2KHR;
   using VULKAN_HPP_NAMESPACE::PipelineStageFlags2;
+  using VULKAN_HPP_NAMESPACE::PipelineStageFlags2KHR;
   using VULKAN_HPP_NAMESPACE::PrivateDataSlotCreateFlagBits;
   using VULKAN_HPP_NAMESPACE::PrivateDataSlotCreateFlagBitsEXT;
   using VULKAN_HPP_NAMESPACE::PrivateDataSlotCreateFlags;
+  using VULKAN_HPP_NAMESPACE::PrivateDataSlotCreateFlagsEXT;
   using VULKAN_HPP_NAMESPACE::RenderingFlagBits;
   using VULKAN_HPP_NAMESPACE::RenderingFlagBitsKHR;
   using VULKAN_HPP_NAMESPACE::RenderingFlags;
+  using VULKAN_HPP_NAMESPACE::RenderingFlagsKHR;
   using VULKAN_HPP_NAMESPACE::SubmitFlagBits;
   using VULKAN_HPP_NAMESPACE::SubmitFlagBitsKHR;
   using VULKAN_HPP_NAMESPACE::SubmitFlags;
+  using VULKAN_HPP_NAMESPACE::SubmitFlagsKHR;
   using VULKAN_HPP_NAMESPACE::ToolPurposeFlagBits;
   using VULKAN_HPP_NAMESPACE::ToolPurposeFlagBitsEXT;
   using VULKAN_HPP_NAMESPACE::ToolPurposeFlags;
+  using VULKAN_HPP_NAMESPACE::ToolPurposeFlagsEXT;
 
   //=== VK_KHR_surface ===
   using VULKAN_HPP_NAMESPACE::ColorSpaceKHR;
@@ -551,15 +574,18 @@ export namespace VULKAN_HPP_NAMESPACE
   using VULKAN_HPP_NAMESPACE::BuildAccelerationStructureFlagBitsKHR;
   using VULKAN_HPP_NAMESPACE::BuildAccelerationStructureFlagBitsNV;
   using VULKAN_HPP_NAMESPACE::BuildAccelerationStructureFlagsKHR;
+  using VULKAN_HPP_NAMESPACE::BuildAccelerationStructureFlagsNV;
   using VULKAN_HPP_NAMESPACE::BuildAccelerationStructureModeKHR;
   using VULKAN_HPP_NAMESPACE::CopyAccelerationStructureModeKHR;
   using VULKAN_HPP_NAMESPACE::CopyAccelerationStructureModeNV;
   using VULKAN_HPP_NAMESPACE::GeometryFlagBitsKHR;
   using VULKAN_HPP_NAMESPACE::GeometryFlagBitsNV;
   using VULKAN_HPP_NAMESPACE::GeometryFlagsKHR;
+  using VULKAN_HPP_NAMESPACE::GeometryFlagsNV;
   using VULKAN_HPP_NAMESPACE::GeometryInstanceFlagBitsKHR;
   using VULKAN_HPP_NAMESPACE::GeometryInstanceFlagBitsNV;
   using VULKAN_HPP_NAMESPACE::GeometryInstanceFlagsKHR;
+  using VULKAN_HPP_NAMESPACE::GeometryInstanceFlagsNV;
   using VULKAN_HPP_NAMESPACE::GeometryTypeKHR;
   using VULKAN_HPP_NAMESPACE::GeometryTypeNV;
 
diff --git a/vulkan/vulkansc.cppm b/vulkan/vulkansc.cppm
index 1dca80e..1157eef 100644
--- a/vulkan/vulkansc.cppm
+++ b/vulkan/vulkansc.cppm
@@ -231,30 +231,39 @@ export namespace VULKAN_HPP_NAMESPACE
   using VULKAN_HPP_NAMESPACE::ExternalFenceFeatureFlagBits;
   using VULKAN_HPP_NAMESPACE::ExternalFenceFeatureFlagBitsKHR;
   using VULKAN_HPP_NAMESPACE::ExternalFenceFeatureFlags;
+  using VULKAN_HPP_NAMESPACE::ExternalFenceFeatureFlagsKHR;
   using VULKAN_HPP_NAMESPACE::ExternalFenceHandleTypeFlagBits;
   using VULKAN_HPP_NAMESPACE::ExternalFenceHandleTypeFlagBitsKHR;
   using VULKAN_HPP_NAMESPACE::ExternalFenceHandleTypeFlags;
+  using VULKAN_HPP_NAMESPACE::ExternalFenceHandleTypeFlagsKHR;
   using VULKAN_HPP_NAMESPACE::ExternalMemoryFeatureFlagBits;
   using VULKAN_HPP_NAMESPACE::ExternalMemoryFeatureFlagBitsKHR;
   using VULKAN_HPP_NAMESPACE::ExternalMemoryFeatureFlags;
+  using VULKAN_HPP_NAMESPACE::ExternalMemoryFeatureFlagsKHR;
   using VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits;
   using VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBitsKHR;
   using VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlags;
+  using VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagsKHR;
   using VULKAN_HPP_NAMESPACE::ExternalSemaphoreFeatureFlagBits;
   using VULKAN_HPP_NAMESPACE::ExternalSemaphoreFeatureFlagBitsKHR;
   using VULKAN_HPP_NAMESPACE::ExternalSemaphoreFeatureFlags;
+  using VULKAN_HPP_NAMESPACE::ExternalSemaphoreFeatureFlagsKHR;
   using VULKAN_HPP_NAMESPACE::ExternalSemaphoreHandleTypeFlagBits;
   using VULKAN_HPP_NAMESPACE::ExternalSemaphoreHandleTypeFlagBitsKHR;
   using VULKAN_HPP_NAMESPACE::ExternalSemaphoreHandleTypeFlags;
+  using VULKAN_HPP_NAMESPACE::ExternalSemaphoreHandleTypeFlagsKHR;
   using VULKAN_HPP_NAMESPACE::FenceImportFlagBits;
   using VULKAN_HPP_NAMESPACE::FenceImportFlagBitsKHR;
   using VULKAN_HPP_NAMESPACE::FenceImportFlags;
+  using VULKAN_HPP_NAMESPACE::FenceImportFlagsKHR;
   using VULKAN_HPP_NAMESPACE::MemoryAllocateFlagBits;
   using VULKAN_HPP_NAMESPACE::MemoryAllocateFlagBitsKHR;
   using VULKAN_HPP_NAMESPACE::MemoryAllocateFlags;
+  using VULKAN_HPP_NAMESPACE::MemoryAllocateFlagsKHR;
   using VULKAN_HPP_NAMESPACE::PeerMemoryFeatureFlagBits;
   using VULKAN_HPP_NAMESPACE::PeerMemoryFeatureFlagBitsKHR;
   using VULKAN_HPP_NAMESPACE::PeerMemoryFeatureFlags;
+  using VULKAN_HPP_NAMESPACE::PeerMemoryFeatureFlagsKHR;
   using VULKAN_HPP_NAMESPACE::PointClippingBehavior;
   using VULKAN_HPP_NAMESPACE::PointClippingBehaviorKHR;
   using VULKAN_HPP_NAMESPACE::SamplerYcbcrModelConversion;
@@ -264,6 +273,7 @@ export namespace VULKAN_HPP_NAMESPACE
   using VULKAN_HPP_NAMESPACE::SemaphoreImportFlagBits;
   using VULKAN_HPP_NAMESPACE::SemaphoreImportFlagBitsKHR;
   using VULKAN_HPP_NAMESPACE::SemaphoreImportFlags;
+  using VULKAN_HPP_NAMESPACE::SemaphoreImportFlagsKHR;
   using VULKAN_HPP_NAMESPACE::SubgroupFeatureFlagBits;
   using VULKAN_HPP_NAMESPACE::SubgroupFeatureFlags;
   using VULKAN_HPP_NAMESPACE::TessellationDomainOrigin;
@@ -273,11 +283,13 @@ export namespace VULKAN_HPP_NAMESPACE
   using VULKAN_HPP_NAMESPACE::DescriptorBindingFlagBits;
   using VULKAN_HPP_NAMESPACE::DescriptorBindingFlagBitsEXT;
   using VULKAN_HPP_NAMESPACE::DescriptorBindingFlags;
+  using VULKAN_HPP_NAMESPACE::DescriptorBindingFlagsEXT;
   using VULKAN_HPP_NAMESPACE::DriverId;
   using VULKAN_HPP_NAMESPACE::DriverIdKHR;
   using VULKAN_HPP_NAMESPACE::ResolveModeFlagBits;
   using VULKAN_HPP_NAMESPACE::ResolveModeFlagBitsKHR;
   using VULKAN_HPP_NAMESPACE::ResolveModeFlags;
+  using VULKAN_HPP_NAMESPACE::ResolveModeFlagsKHR;
   using VULKAN_HPP_NAMESPACE::SamplerReductionMode;
   using VULKAN_HPP_NAMESPACE::SamplerReductionModeEXT;
   using VULKAN_HPP_NAMESPACE::SemaphoreType;
@@ -285,6 +297,7 @@ export namespace VULKAN_HPP_NAMESPACE
   using VULKAN_HPP_NAMESPACE::SemaphoreWaitFlagBits;
   using VULKAN_HPP_NAMESPACE::SemaphoreWaitFlagBitsKHR;
   using VULKAN_HPP_NAMESPACE::SemaphoreWaitFlags;
+  using VULKAN_HPP_NAMESPACE::SemaphoreWaitFlagsKHR;
   using VULKAN_HPP_NAMESPACE::ShaderFloatControlsIndependence;
   using VULKAN_HPP_NAMESPACE::ShaderFloatControlsIndependenceKHR;
 
@@ -292,27 +305,35 @@ export namespace VULKAN_HPP_NAMESPACE
   using VULKAN_HPP_NAMESPACE::AccessFlagBits2;
   using VULKAN_HPP_NAMESPACE::AccessFlagBits2KHR;
   using VULKAN_HPP_NAMESPACE::AccessFlags2;
+  using VULKAN_HPP_NAMESPACE::AccessFlags2KHR;
   using VULKAN_HPP_NAMESPACE::FormatFeatureFlagBits2;
   using VULKAN_HPP_NAMESPACE::FormatFeatureFlagBits2KHR;
   using VULKAN_HPP_NAMESPACE::FormatFeatureFlags2;
+  using VULKAN_HPP_NAMESPACE::FormatFeatureFlags2KHR;
   using VULKAN_HPP_NAMESPACE::PipelineCreationFeedbackFlagBits;
   using VULKAN_HPP_NAMESPACE::PipelineCreationFeedbackFlagBitsEXT;
   using VULKAN_HPP_NAMESPACE::PipelineCreationFeedbackFlags;
+  using VULKAN_HPP_NAMESPACE::PipelineCreationFeedbackFlagsEXT;
   using VULKAN_HPP_NAMESPACE::PipelineStageFlagBits2;
   using VULKAN_HPP_NAMESPACE::PipelineStageFlagBits2KHR;
   using VULKAN_HPP_NAMESPACE::PipelineStageFlags2;
+  using VULKAN_HPP_NAMESPACE::PipelineStageFlags2KHR;
   using VULKAN_HPP_NAMESPACE::PrivateDataSlotCreateFlagBits;
   using VULKAN_HPP_NAMESPACE::PrivateDataSlotCreateFlagBitsEXT;
   using VULKAN_HPP_NAMESPACE::PrivateDataSlotCreateFlags;
+  using VULKAN_HPP_NAMESPACE::PrivateDataSlotCreateFlagsEXT;
   using VULKAN_HPP_NAMESPACE::RenderingFlagBits;
   using VULKAN_HPP_NAMESPACE::RenderingFlagBitsKHR;
   using VULKAN_HPP_NAMESPACE::RenderingFlags;
+  using VULKAN_HPP_NAMESPACE::RenderingFlagsKHR;
   using VULKAN_HPP_NAMESPACE::SubmitFlagBits;
   using VULKAN_HPP_NAMESPACE::SubmitFlagBitsKHR;
   using VULKAN_HPP_NAMESPACE::SubmitFlags;
+  using VULKAN_HPP_NAMESPACE::SubmitFlagsKHR;
   using VULKAN_HPP_NAMESPACE::ToolPurposeFlagBits;
   using VULKAN_HPP_NAMESPACE::ToolPurposeFlagBitsEXT;
   using VULKAN_HPP_NAMESPACE::ToolPurposeFlags;
+  using VULKAN_HPP_NAMESPACE::ToolPurposeFlagsEXT;
 
   //=== VKSC_VERSION_1_0 ===
   using VULKAN_HPP_NAMESPACE::FaultLevel;