Simplified typename checks on allocator template types

KhronosGroup · Jan 10, 2024 · e0546d0 · e0546d0
1 parent 180ef2f
commit e0546d0
Show file tree

Hide file tree

Showing 7 changed files with 653 additions and 697 deletions.
diff --git a/VulkanHppGenerator.cpp b/VulkanHppGenerator.cpp
@@ -11435,27 +11435,17 @@ std::string VulkanHppGenerator::generateTypenameCheck( std::vector<size_t> const
         {
           extendedElementType = "UniqueHandle<" + elementType + ", Dispatch>";
         }
-        std::string index = std::to_string( i );
-        if ( definition )
+        elementType = startUpperCase( stripPrefix( elementType, "VULKAN_HPP_NAMESPACE::" ) );
+        if ( !enableIf.empty() )
         {
-          typenameCheck += ", typename B" + index;
+          enableIf += " && ";
         }
-        else
-        {
-          typenameCheck += ", typename B" + index + " = " + startUpperCase( stripPrefix( elementType, "VULKAN_HPP_NAMESPACE::" ) ) + "Allocator";
-        }
-        enableIf += enableIf.empty() ? ", typename std::enable_if<" : " && ";
-        enableIf += "std::is_same<typename B" + index + "::value_type, " + extendedElementType + ">::value";
+        enableIf += "std::is_same<typename " + elementType + "Allocator::value_type, " + extendedElementType + " > ::value ";
       }
     }
-    assert( !typenameCheck.empty() );
-    if ( !typenameCheck.empty() )
+    if ( !enableIf.empty() )
     {
-      typenameCheck += enableIf + ", int>::type";
-      if ( !definition )
-      {
-        typenameCheck += " = 0";
-      }
+      typenameCheck = ", typename std::enable_if<" + enableIf + ", int>::type" + ( definition ? "" : " = 0" );
     }
   }
   return typenameCheck;

diff --git a/vulkan/vulkan.hpp b/vulkan/vulkan.hpp
@@ -35,7 +35,7 @@
 #if VULKAN_HPP_ENABLE_DYNAMIC_LOADER_TOOL == 1
 #  if defined( __unix__ ) || defined( __APPLE__ ) || defined( __QNX__ ) || defined( __Fuchsia__ )
 #    include <dlfcn.h>
-#  elif defined( _WIN32 )
+#  elif defined( _WIN32 ) && !defined( VULKAN_HPP_NO_WIN32_PROTOTYPES )
 typedef struct HINSTANCE__ * HINSTANCE;
 #    if defined( _WIN64 )
 typedef int64_t( __stdcall * FARPROC )();
@@ -16307,7 +16307,7 @@ namespace VULKAN_HPP_NAMESPACE
           m_library = dlopen( "libvulkan.1.dylib", RTLD_NOW | RTLD_LOCAL );
         }
 #  elif defined( _WIN32 )
-        m_library = ::LoadLibraryA( "vulkan-1.dll" );
+          m_library = ::LoadLibraryA( "vulkan-1.dll" );
 #  else
 #    error unsupported platform
 #  endif

diff --git a/vulkan/vulkan_funcs.hpp b/vulkan/vulkan_funcs.hpp
diff --git a/vulkan/vulkan_handles.hpp b/vulkan/vulkan_handles.hpp
diff --git a/vulkan/vulkansc.hpp b/vulkan/vulkansc.hpp
@@ -35,7 +35,7 @@
 #if VULKAN_HPP_ENABLE_DYNAMIC_LOADER_TOOL == 1
 #  if defined( __unix__ ) || defined( __APPLE__ ) || defined( __QNX__ ) || defined( __Fuchsia__ )
 #    include <dlfcn.h>
-#  elif defined( _WIN32 )
+#  elif defined( _WIN32 ) && !defined( VULKAN_HPP_NO_WIN32_PROTOTYPES )
 typedef struct HINSTANCE__ * HINSTANCE;
 #    if defined( _WIN64 )
 typedef int64_t( __stdcall * FARPROC )();
@@ -6995,7 +6995,7 @@ namespace VULKAN_HPP_NAMESPACE
           m_library = dlopen( "libvulkan.1.dylib", RTLD_NOW | RTLD_LOCAL );
         }
 #  elif defined( _WIN32 )
-        m_library = ::LoadLibraryA( "vulkan-1.dll" );
+          m_library = ::LoadLibraryA( "vulkan-1.dll" );
 #  else
 #    error unsupported platform
 #  endif

diff --git a/vulkan/vulkansc_funcs.hpp b/vulkan/vulkansc_funcs.hpp
diff --git a/vulkan/vulkansc_handles.hpp b/vulkan/vulkansc_handles.hpp