Add some special handling for vkReleaseDisplayEXT (#2509)

asuessenbach · web-flow · commit f6e752dc0490 · 2026-03-02T15:19:49.000+01:00
diff --git a/VulkanHppGenerator.cpp b/VulkanHppGenerator.cpp
@@ -3843,7 +3843,8 @@ std::string VulkanHppGenerator::generateCommandDefinitions( std::string const &
   std::string commandName = generateCommandName( command, commandIt->second.params, 1 );
   if ( ( command == commandIt->first ) && ( ( ( command.substr( 2, 7 ) == "Destroy" ) && ( commandName != "destroy" ) ) ||
                                             ( command.substr( 2, 4 ) == "Free" ) ||
-                                            ( command == "vkReleasePerformanceConfigurationINTEL" ) ) )
+                                            ( command == "vkReleasePerformanceConfigurationINTEL" ) ||
+                                            ( command == "vkReleaseDisplayEXT" ) ) )
   {
     CommandData specialCommandData = commandIt->second;
     assert( ( 1 < specialCommandData.params.size() ) && ( specialCommandData.params[0].type.type == handle ) );
@@ -3861,7 +3862,7 @@ std::string VulkanHppGenerator::generateCommandDefinitions( std::string const &
     }
     else
     {
-      assert( command == "vkReleasePerformanceConfigurationINTEL" );
+      assert( ( command == "vkReleasePerformanceConfigurationINTEL" ) || ( command == "vkReleaseDisplayEXT" ) );
       shortenedName = "release";
     }
     size_t pos = destroyCommandString.find( commandName );
@@ -5626,7 +5627,8 @@ std::string VulkanHppGenerator::generateDestroyCommand( std::string const & name
   std::string commandName = generateCommandName( name, commandData.params, 1 );
   if ( m_commands.contains( name ) && ( ( ( name.substr( 2, 7 ) == "Destroy" ) && ( commandName != "destroy" ) ) ||
                                         ( name.substr( 2, 4 ) == "Free" ) ||
-                                        ( name == "vkReleasePerformanceConfigurationINTEL" ) ) )
+                                        ( name == "vkReleasePerformanceConfigurationINTEL" ) ||
+                                        ( name == "vkReleaseDisplayEXT" ) ) )
   {
     assert( 1 < commandData.params.size() );
     // make sure, the object to destroy/free/release is not optional in the shortened version!
@@ -5646,7 +5648,7 @@ std::string VulkanHppGenerator::generateDestroyCommand( std::string const & name
     }
     else
     {
-      assert( name == "vkReleasePerformanceConfigurationINTEL" );
+      assert( ( name == "vkReleasePerformanceConfigurationINTEL" ) || ( name == "vkReleaseDisplayEXT" ) );
       shortenedName = "release";
     }
     size_t pos = destroyCommandString.find( commandName );
@@ -16404,7 +16406,7 @@ bool VulkanHppGenerator::structureHoldsVector( StructData const & structData ) c
   return findVectorMember( structData.members ) != structData.members.end();
 }
 
-std::string VulkanHppGenerator::toString( TypeCategory category )
+std::string VulkanHppGenerator::toString( TypeCategory category ) const
 {
   switch ( category )
   {
diff --git a/VulkanHppGenerator.hpp b/VulkanHppGenerator.hpp
@@ -1278,7 +1278,7 @@ class VulkanHppGenerator
   bool                     structureChainHoldsVector( std::string const & name ) const;
   bool                     structureHoldsHandle( StructData const & structData ) const;
   bool                     structureHoldsVector( StructData const & structData ) const;
-  std::string              toString( TypeCategory category );
+  std::string              toString( TypeCategory category ) const;
   MemberData const &       vectorMemberByStructure( std::string const & structureType ) const;
 
 private:
diff --git a/tests/UniqueHandleDefaultArguments/UniqueHandleDefaultArguments.cpp b/tests/UniqueHandleDefaultArguments/UniqueHandleDefaultArguments.cpp
@@ -16,6 +16,10 @@
 
 // Should be used on 64 bit only, as on 32 bit the test is ambiguous.
 
+#if !defined( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC )
+#  define VULKAN_HPP_DISPATCH_LOADER_DYNAMIC 1
+#endif
+
 #ifdef VULKAN_HPP_USE_CXX_MODULE
 #  include <vulkan/vulkan.h>
 import vulkan;
@@ -26,14 +30,24 @@ VULKAN_HPP_DEFAULT_DISPATCH_LOADER_DYNAMIC_STORAGE
 
 int main()
 {
-  VkSurfaceKHR surface       = 0;
-  auto         uniqueSurface = vk::UniqueSurfaceKHR( static_cast<vk::SurfaceKHR>( surface ), vk::Instance() );
+  {
+    VkSurfaceKHR surface       = 0;
+    auto         uniqueSurface = vk::UniqueSurfaceKHR( static_cast<vk::SurfaceKHR>( surface ), vk::Instance() );
+  }
 
-  vk::PhysicalDevice phys              = {};
-  auto               uniqueDisplayMode = phys.createDisplayModeKHRUnique( {}, {} );
+  {
+    vk::PhysicalDevice phys              = {};
+    auto               uniqueDisplayMode = phys.createDisplayModeKHRUnique( {}, {} );
+  }
 
-  vk::Device device           = {};
-  auto       uniquePerfConfig = device.acquirePerformanceConfigurationINTELUnique( {} );
+  {
+    vk::Device device           = {};
+    auto       uniquePerfConfig = device.acquirePerformanceConfigurationINTELUnique( {} );
+  }
 
+  {
+    vk::PhysicalDevice phys          = {};
+    auto               uniqueDisplay = phys.getDrmDisplayEXTUnique( 0, 0 );
+  }
   return 0;
 }
diff --git a/vulkan/vulkan_funcs.hpp b/vulkan/vulkan_funcs.hpp
@@ -13978,6 +13978,32 @@ VULKAN_HPP_EXPORT namespace VULKAN_HPP_NAMESPACE
   }
 #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
+#ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
+  // wrapper function for command vkReleaseDisplayEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkReleaseDisplayEXT.html
+  template <typename Dispatch, typename std::enable_if<IS_DISPATCHED( vkReleaseDisplayEXT ), bool>::type>
+  VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE Result PhysicalDevice::release( DisplayKHR display, Dispatch const & d ) const VULKAN_HPP_NOEXCEPT
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+    return static_cast<Result>( d.vkReleaseDisplayEXT( static_cast<VkPhysicalDevice>( m_physicalDevice ), static_cast<VkDisplayKHR>( display ) ) );
+  }
+#else
+  // wrapper function for command vkReleaseDisplayEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkReleaseDisplayEXT.html
+  template <typename Dispatch, typename std::enable_if<IS_DISPATCHED( vkReleaseDisplayEXT ), bool>::type>
+  VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS VULKAN_HPP_INLINE typename ResultValueType<void>::type PhysicalDevice::release( DisplayKHR       display,
+                                                                                                                          Dispatch const & d ) const
+  {
+    VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#  if ( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+    VULKAN_HPP_ASSERT( d.vkReleaseDisplayEXT && "Function <vkReleaseDisplayEXT> requires <VK_EXT_direct_mode_display>" );
+#  endif
+
+    Result result = static_cast<Result>( d.vkReleaseDisplayEXT( m_physicalDevice, static_cast<VkDisplayKHR>( display ) ) );
+    detail::resultCheck( result, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::release" );
+
+    return detail::createResultValueType( result );
+  }
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
+
 #if defined( VK_USE_PLATFORM_XLIB_XRANDR_EXT )
   //=== VK_EXT_acquire_xlib_display ===
 
diff --git a/vulkan/vulkan_handles.hpp b/vulkan/vulkan_handles.hpp
@@ -20690,6 +20690,17 @@ VULKAN_HPP_EXPORT namespace VULKAN_HPP_NAMESPACE
       releaseDisplayEXT( DisplayKHR display, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
 #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
+#ifdef VULKAN_HPP_DISABLE_ENHANCED_MODE
+    // wrapper function for command vkReleaseDisplayEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkReleaseDisplayEXT.html
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<IS_DISPATCHED( vkReleaseDisplayEXT ), bool>::type = true>
+    VULKAN_HPP_NODISCARD Result release( DisplayKHR display, Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const VULKAN_HPP_NOEXCEPT;
+#else
+    // wrapper function for command vkReleaseDisplayEXT, see https://registry.khronos.org/vulkan/specs/latest/man/html/vkReleaseDisplayEXT.html
+    template <typename Dispatch = VULKAN_HPP_DEFAULT_DISPATCHER_TYPE, typename std::enable_if<IS_DISPATCHED( vkReleaseDisplayEXT ), bool>::type = true>
+    VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS typename ResultValueType<void>::type release( DisplayKHR         display,
+                                                                                          Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) const;
+#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
+
 #if defined( VK_USE_PLATFORM_XLIB_XRANDR_EXT )
     //=== VK_EXT_acquire_xlib_display ===
 

Original file line number	Diff line number	Diff line change
`@@ -3843,7 +3843,8 @@ std::string VulkanHppGenerator::generateCommandDefinitions( std::string const &`
`3843`	`3843`	`std::string commandName = generateCommandName( command, commandIt->second.params, 1 );`
`3844`	`3844`	`if ( ( command == commandIt->first ) && ( ( ( command.substr( 2, 7 ) == "Destroy" ) && ( commandName != "destroy" ) ) \|\|`
`3845`	`3845`	`( command.substr( 2, 4 ) == "Free" ) \|\|`
`3846`		`- ( command == "vkReleasePerformanceConfigurationINTEL" ) ) )`
	`3846`	`+ ( command == "vkReleasePerformanceConfigurationINTEL" ) \|\|`
	`3847`	`+ ( command == "vkReleaseDisplayEXT" ) ) )`
`3847`	`3848`	`{`
`3848`	`3849`	`CommandData specialCommandData = commandIt->second;`
`3849`	`3850`	`assert( ( 1 < specialCommandData.params.size() ) && ( specialCommandData.params[0].type.type == handle ) );`
`@@ -3861,7 +3862,7 @@ std::string VulkanHppGenerator::generateCommandDefinitions( std::string const &`
`3861`	`3862`	`}`
`3862`	`3863`	`else`
`3863`	`3864`	`{`
`3864`		`- assert( command == "vkReleasePerformanceConfigurationINTEL" );`
	`3865`	`+ assert( ( command == "vkReleasePerformanceConfigurationINTEL" ) \|\| ( command == "vkReleaseDisplayEXT" ) );`
`3865`	`3866`	`shortenedName = "release";`
`3866`	`3867`	`}`
`3867`	`3868`	`size_t pos = destroyCommandString.find( commandName );`
`@@ -5626,7 +5627,8 @@ std::string VulkanHppGenerator::generateDestroyCommand( std::string const & name`
`5626`	`5627`	`std::string commandName = generateCommandName( name, commandData.params, 1 );`
`5627`	`5628`	`if ( m_commands.contains( name ) && ( ( ( name.substr( 2, 7 ) == "Destroy" ) && ( commandName != "destroy" ) ) \|\|`
`5628`	`5629`	`( name.substr( 2, 4 ) == "Free" ) \|\|`
`5629`		`- ( name == "vkReleasePerformanceConfigurationINTEL" ) ) )`
	`5630`	`+ ( name == "vkReleasePerformanceConfigurationINTEL" ) \|\|`
	`5631`	`+ ( name == "vkReleaseDisplayEXT" ) ) )`
`5630`	`5632`	`{`
`5631`	`5633`	`assert( 1 < commandData.params.size() );`
`5632`	`5634`	`// make sure, the object to destroy/free/release is not optional in the shortened version!`
`@@ -5646,7 +5648,7 @@ std::string VulkanHppGenerator::generateDestroyCommand( std::string const & name`
`5646`	`5648`	`}`
`5647`	`5649`	`else`
`5648`	`5650`	`{`
`5649`		`- assert( name == "vkReleasePerformanceConfigurationINTEL" );`
	`5651`	`+ assert( ( name == "vkReleasePerformanceConfigurationINTEL" ) \|\| ( name == "vkReleaseDisplayEXT" ) );`
`5650`	`5652`	`shortenedName = "release";`
`5651`	`5653`	`}`
`5652`	`5654`	`size_t pos = destroyCommandString.find( commandName );`
`@@ -16404,7 +16406,7 @@ bool VulkanHppGenerator::structureHoldsVector( StructData const & structData ) c`
`16404`	`16406`	`return findVectorMember( structData.members ) != structData.members.end();`
`16405`	`16407`	`}`
`16406`	`16408`
`16407`		`-std::string VulkanHppGenerator::toString( TypeCategory category )`
	`16409`	`+std::string VulkanHppGenerator::toString( TypeCategory category ) const`
`16408`	`16410`	`{`
`16409`	`16411`	`switch ( category )`
`16410`	`16412`	`{`