Add function pointer check when using DispatchLoaderDynamic. (#1769)

KhronosGroup · Jan 8, 2024 · 9eab68e · 9eab68e
1 parent 1a24b01
commit 9eab68e
Show file tree

Hide file tree

Showing 4 changed files with 3,795 additions and 4 deletions.
diff --git a/VulkanHppGenerator.cpp b/VulkanHppGenerator.cpp
@@ -3460,6 +3460,9 @@ std::string VulkanHppGenerator::generateCommandEnhanced( std::string const &
   ${nodiscard}VULKAN_HPP_INLINE ${decoratedReturnType} ${className}${classSeparator}${commandName}( ${argumentList} )${const}${noexcept}
   {
     VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION );
+#if (VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1 )
+${functionPointerCheck}
+#endif
 ${vectorSizeCheck}
     ${dataSizeChecks}
     ${dataDeclarations}
@@ -3482,6 +3485,7 @@ std::string VulkanHppGenerator::generateCommandEnhanced( std::string const &
                              { "dataPreparation", dataPreparation },
                              { "dataSizeChecks", dataSizeChecks },
                              { "decoratedReturnType", decoratedReturnType },
+                             { "functionPointerCheck", generateFunctionPointerCheck( name, commandData.requiredBy, false ) },
                              { "nodiscard", nodiscard },
                              { "noexcept", noexceptString },
                              { "resultCheck", resultCheck },
@@ -7507,7 +7511,7 @@ std::string VulkanHppGenerator::generateFormatTraits() const
                            { "texelsPerBlockCases", texelsPerBlockCases } } );
 }
 
-std::string VulkanHppGenerator::generateFunctionPointerCheck( std::string const & function, std::set<std::string> const & requiredBy ) const
+std::string VulkanHppGenerator::generateFunctionPointerCheck( std::string const & function, std::set<std::string> const & requiredBy, bool raii ) const
 {
   std::string functionPointerCheck;
   if ( !requiredBy.empty() )
@@ -7518,7 +7522,7 @@ std::string VulkanHppGenerator::generateFunctionPointerCheck( std::string const
       message += " or <" + *it + ">";
     }
 
-    functionPointerCheck = "VULKAN_HPP_ASSERT( getDispatcher()->" + function + " && \"" + message + "\" );";
+    functionPointerCheck = std::string( "VULKAN_HPP_ASSERT( " ) + ( raii ? "getDispatcher()->" : "d." ) + function + " && \"" + message + "\" );";
   }
   return functionPointerCheck;
 }
@@ -8672,7 +8676,7 @@ std::string VulkanHppGenerator::generateRAIIHandleCommandEnhanced( std::string c
                              { "dataDeclarations", dataDeclarations },
                              { "dataPreparation", dataPreparation },
                              { "dataSizeChecks", dataSizeChecks },
-                             { "functionPointerCheck", generateFunctionPointerCheck( name, commandData.requiredBy ) },
+                             { "functionPointerCheck", generateFunctionPointerCheck( name, commandData.requiredBy, true ) },
                              { "nodiscard", nodiscard },
                              { "noexcept", noexceptString },
                              { "resultCheck", resultCheck },

diff --git a/VulkanHppGenerator.hpp b/VulkanHppGenerator.hpp
@@ -718,7 +718,7 @@ class VulkanHppGenerator
   std::string generateExtensionsList( std::string const & type ) const;
   std::string generateExtensionTypeTest( std::string const & type ) const;
   std::string generateFormatTraits() const;
-  std::string generateFunctionPointerCheck( std::string const & function, std::set<std::string> const & requiredBy ) const;
+  std::string generateFunctionPointerCheck( std::string const & function, std::set<std::string> const & requiredBy, bool raii ) const;
   std::string generateHandle( std::pair<std::string, HandleData> const & handle, std::set<std::string> & listedHandles ) const;
   std::string generateHandleCommandDeclarations( std::set<std::string> const & commands ) const;
   std::string generateHandleDependencies( std::pair<std::string, HandleData> const & handle, std::set<std::string> & listedHandles ) const;