Fix compilation with VULKAN_HPP_TYPESAFE_CONVERSION=0

Fixes #81

Author: YaaZ

.github/workflows/build.yml

@@ -95,7 +95,7 @@ jobs:
           cmake "${FLAGS[@]}" -DCMAKE_CXX_FLAGS="$CXX_FLAGS -DVULKAN_HPP_NO_SMART_HANDLE"
           cmake --build build --clean-first
           
-          cmake "${FLAGS[@]}" -DCMAKE_CXX_FLAGS="$CXX_FLAGS -DVULKAN_HPP_NO_EXCEPTIONS -DVULKAN_HPP_USE_REFLECT -DVULKAN_HPP_HANDLES_MOVE_EXCHANGE"
+          cmake "${FLAGS[@]}" -DCMAKE_CXX_FLAGS="$CXX_FLAGS -DVULKAN_HPP_NO_EXCEPTIONS -DVULKAN_HPP_USE_REFLECT -DVULKAN_HPP_HANDLES_MOVE_EXCHANGE -DVULKAN_HPP_TYPESAFE_CONVERSION=0"
           cmake --build build --clean-first
           
           echo Building with latest Vulkan...
@@ -105,7 +105,7 @@ jobs:
           cmake "${FLAGS[@]}" -DCMAKE_CXX_FLAGS="$CXX_FLAGS -DVULKAN_HPP_NO_SMART_HANDLE"
           cmake --build build --clean-first
           
-          cmake "${FLAGS[@]}" -DCMAKE_CXX_FLAGS="$CXX_FLAGS -DVULKAN_HPP_NO_EXCEPTIONS -DVULKAN_HPP_USE_REFLECT -DVULKAN_HPP_HANDLES_MOVE_EXCHANGE"
+          cmake "${FLAGS[@]}" -DCMAKE_CXX_FLAGS="$CXX_FLAGS -DVULKAN_HPP_NO_EXCEPTIONS -DVULKAN_HPP_USE_REFLECT -DVULKAN_HPP_HANDLES_MOVE_EXCHANGE -DVULKAN_HPP_TYPESAFE_CONVERSION=0"
           cmake --build build --clean-first
           
           mv VulkanMemoryAllocator/include/vk_mem_alloc.h include

VmaHppGenerator.cpp

@@ -1944,7 +1944,7 @@ void generateHandles(const Source& source, Symbols& symbols) {
           using UniqueBase::UniqueBase;
         protected:
           template <typename T> void destroy(T t) VULKAN_HPP_NOEXCEPT {
-            vmaDestroyBuffer(getOwner(), t, nullptr);
+            vmaDestroyBuffer(static_cast<VmaAllocator>(getOwner()), static_cast<VkBuffer>(t), nullptr);
           }
         };
       };
@@ -1955,7 +1955,7 @@ void generateHandles(const Source& source, Symbols& symbols) {
           using UniqueBase::UniqueBase;
         protected:
           template <typename T> void destroy(T t) VULKAN_HPP_NOEXCEPT {
-            vmaDestroyImage(getOwner(), t, nullptr);
+            vmaDestroyImage(static_cast<VmaAllocator>(getOwner()), static_cast<VkImage>(t), nullptr);
           }
         };
       };

include/vk_mem_alloc_handles.hpp

@@ -1290,7 +1290,7 @@ namespace VULKAN_HPP_NAMESPACE {
       using UniqueBase::UniqueBase;
     protected:
       template <typename T> void destroy(T t) VULKAN_HPP_NOEXCEPT {
-        vmaDestroyBuffer(getOwner(), t, nullptr);
+        vmaDestroyBuffer(static_cast<VmaAllocator>(getOwner()), static_cast<VkBuffer>(t), nullptr);
       }
     };
   };
@@ -1301,7 +1301,7 @@ namespace VULKAN_HPP_NAMESPACE {
       using UniqueBase::UniqueBase;
     protected:
       template <typename T> void destroy(T t) VULKAN_HPP_NOEXCEPT {
-        vmaDestroyImage(getOwner(), t, nullptr);
+        vmaDestroyImage(static_cast<VmaAllocator>(getOwner()), static_cast<VkImage>(t), nullptr);
       }
     };
   };

samples/CompileCheck.cpp

@@ -84,7 +84,7 @@ void checkStructs() {
 void checkHandles() {
     vma::Allocator allocator;
     allocator = nullptr;
-    allocator = static_cast<VmaAllocator>(VK_NULL_HANDLE);
+    allocator = VK_NULL_HANDLE;
 
     if (allocator) throw;
     if (!allocator) {}