diff --git a/.github/workflows/build-custom-vulkan.yml b/.github/workflows/build-custom-vulkan.yml index db8f102..e98a44d 100644 --- a/.github/workflows/build-custom-vulkan.yml +++ b/.github/workflows/build-custom-vulkan.yml @@ -125,3 +125,5 @@ jobs: run: build ${{env.vk || env.modules && 'v1.4.344' || 'v1.4.327'}} -DVULKAN_HPP_NO_SMART_HANDLE - if: ${{!cancelled()}} run: build ${{env.vk || env.modules && 'v1.4.344' || 'v1.4.327'}} -DVULKAN_HPP_USE_REFLECT -DVULKAN_HPP_HANDLES_MOVE_EXCHANGE + - if: ${{!cancelled()}} + run: build ${{env.vk || env.modules && 'v1.4.345' || 'v1.4.345'}} -DVULKAN_HPP_TYPESAFE_CONVERSION=0 diff --git a/README.md b/README.md index e3b833c..1c525b5 100644 --- a/README.md +++ b/README.md @@ -19,6 +19,7 @@ consistent and compatible with Vulkan C++ bindings ([Vulkan-Hpp](https://github. 1.4.3271.4.344-DVULKAN_HPP_NO_EXCEPTIONS 1.4.3271.4.344-DVULKAN_HPP_NO_SMART_HANDLE 1.4.3271.4.344-DVULKAN_HPP_USE_REFLECT -DVULKAN_HPP_HANDLES_MOVE_EXCHANGE + 1.4.3451.4.345-DVULKAN_HPP_TYPESAFE_CONVERSION=0 - [VulkanMemoryAllocator](https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator) - *[GitHub releases](https://github.com/YaaZ/VulkanMemoryAllocator-Hpp/releases) is the recommended way to get VMA-Hpp, diff --git a/include/vk_mem_alloc_handles.hpp b/include/vk_mem_alloc_handles.hpp index 80e66bf..814b141 100644 --- a/include/vk_mem_alloc_handles.hpp +++ b/include/vk_mem_alloc_handles.hpp @@ -1290,7 +1290,7 @@ namespace VULKAN_HPP_NAMESPACE { using UniqueBase::UniqueBase; protected: template void destroy(T t) VULKAN_HPP_NOEXCEPT { - vmaDestroyBuffer(getOwner(), t, nullptr); + vmaDestroyBuffer(static_cast(getOwner()), static_cast(t), nullptr); } }; }; @@ -1301,7 +1301,7 @@ namespace VULKAN_HPP_NAMESPACE { using UniqueBase::UniqueBase; protected: template void destroy(T t) VULKAN_HPP_NOEXCEPT { - vmaDestroyImage(getOwner(), t, nullptr); + vmaDestroyImage(static_cast(getOwner()), static_cast(t), nullptr); } }; }; diff --git a/samples/CompileCheck.cpp b/samples/CompileCheck.cpp index 7bd4d07..b545348 100644 --- a/samples/CompileCheck.cpp +++ b/samples/CompileCheck.cpp @@ -84,7 +84,7 @@ void checkStructs() { void checkHandles() { vma::Allocator allocator; allocator = nullptr; - allocator = static_cast(VK_NULL_HANDLE); + allocator = VK_NULL_HANDLE; if (allocator) throw; if (!allocator) {} diff --git a/tools/VmaHppGenerator.cpp b/tools/VmaHppGenerator.cpp index 30da96f..06573b3 100644 --- a/tools/VmaHppGenerator.cpp +++ b/tools/VmaHppGenerator.cpp @@ -1944,7 +1944,7 @@ void generateHandles(const Source& source, Symbols& symbols) { using UniqueBase::UniqueBase; protected: template void destroy(T t) VULKAN_HPP_NOEXCEPT { - vmaDestroyBuffer(getOwner(), t, nullptr); + vmaDestroyBuffer(static_cast(getOwner()), static_cast(t), nullptr); } }; }; @@ -1955,7 +1955,7 @@ void generateHandles(const Source& source, Symbols& symbols) { using UniqueBase::UniqueBase; protected: template void destroy(T t) VULKAN_HPP_NOEXCEPT { - vmaDestroyImage(getOwner(), t, nullptr); + vmaDestroyImage(static_cast(getOwner()), static_cast(t), nullptr); } }; };