Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.8...3.30 FATAL_ERROR)

project(VulkanMemoryAllocator-Hpp-Generator VERSION 3.3.0 LANGUAGES CXX)
project(VulkanMemoryAllocator-Hpp-Generator VERSION 3.4.0 LANGUAGES CXX)

if (CMAKE_VERSION VERSION_LESS "3.21")
# https://cmake.org/cmake/help/latest/variable/PROJECT_IS_TOP_LEVEL.html
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# VulkanMemoryAllocator-Hpp <!--VER-->3.3.0<!--/VER-->
# VulkanMemoryAllocator-Hpp <!--VER-->3.4.0<!--/VER-->

VMA-Hpp provides C++ bindings for [VulkanMemoryAllocator](https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator),
consistent and compatible with Vulkan C++ bindings ([Vulkan-Hpp](https://github.com/KhronosGroup/Vulkan-Hpp)).
Expand Down
2 changes: 1 addition & 1 deletion VulkanMemoryAllocator
2 changes: 1 addition & 1 deletion include/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.8...3.30 FATAL_ERROR)

project(
VulkanMemoryAllocator-Hpp
VERSION 3.3.0
VERSION 3.4.0
DESCRIPTION "C++ bindings for the VulkanMemoryAllocator library."
LANGUAGES CXX)
set(VMA_HPP_PROJECT_VERSION ${PROJECT_VERSION} CACHE INTERNAL "VulkanMemoryAllocator Version")
Expand Down
141 changes: 141 additions & 0 deletions include/vk_mem_alloc_funcs.hpp

Large diffs are not rendered by default.

77 changes: 77 additions & 0 deletions include/vk_mem_alloc_handles.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,27 @@ namespace VMA_HPP_NAMESPACE {
Allocation* pAllocation,
AllocationInfo* pAllocationInfo) const VULKAN_HPP_NOEXCEPT;

#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
// wrapper function for command vmaAllocateDedicatedMemory, see https://gpuopen-librariesandsdks.github.io/VulkanMemoryAllocator/html/globals_func.html
VULKAN_HPP_NODISCARD typename VULKAN_HPP_NAMESPACE::ResultValueType<Allocation>::type allocateDedicatedMemory(const VULKAN_HPP_NAMESPACE::MemoryRequirements& vkMemoryRequirements,
const AllocationCreateInfo& createInfo,
void* memoryAllocateNext,
VULKAN_HPP_NAMESPACE::Optional<AllocationInfo> const & allocationInfo = nullptr) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
#ifndef VULKAN_HPP_NO_SMART_HANDLE
// wrapper function for command vmaAllocateDedicatedMemory, see https://gpuopen-librariesandsdks.github.io/VulkanMemoryAllocator/html/globals_func.html
VULKAN_HPP_NODISCARD typename VULKAN_HPP_NAMESPACE::ResultValueType<UniqueAllocation>::type allocateDedicatedMemoryUnique(const VULKAN_HPP_NAMESPACE::MemoryRequirements& vkMemoryRequirements,
const AllocationCreateInfo& createInfo,
void* memoryAllocateNext,
VULKAN_HPP_NAMESPACE::Optional<AllocationInfo> const & allocationInfo = nullptr) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
#endif
#endif
// wrapper function for command vmaAllocateDedicatedMemory, see https://gpuopen-librariesandsdks.github.io/VulkanMemoryAllocator/html/globals_func.html
VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::Result allocateDedicatedMemory(const VULKAN_HPP_NAMESPACE::MemoryRequirements* pVkMemoryRequirements,
const AllocationCreateInfo* pCreateInfo,
void* pMemoryAllocateNext,
Allocation* pAllocation,
AllocationInfo* pAllocationInfo) const VULKAN_HPP_NOEXCEPT;

#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
// wrapper function for command vmaAllocateMemoryPages, see https://gpuopen-librariesandsdks.github.io/VulkanMemoryAllocator/html/globals_func.html
template <typename AllocationAllocator = std::allocator<Allocation>>
Expand Down Expand Up @@ -431,6 +452,18 @@ namespace VMA_HPP_NAMESPACE {
HANDLE hTargetProcess,
HANDLE* pHandle) const VULKAN_HPP_NOEXCEPT;

#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
// wrapper function for command vmaGetMemoryWin32Handle2, see https://gpuopen-librariesandsdks.github.io/VulkanMemoryAllocator/html/globals_func.html
VULKAN_HPP_NODISCARD typename VULKAN_HPP_NAMESPACE::ResultValueType<HANDLE>::type getMemoryWin32Handle2(Allocation allocation,
VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits handleType,
HANDLE hTargetProcess) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
#endif
// wrapper function for command vmaGetMemoryWin32Handle2, see https://gpuopen-librariesandsdks.github.io/VulkanMemoryAllocator/html/globals_func.html
VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::Result getMemoryWin32Handle2(Allocation allocation,
VULKAN_HPP_NAMESPACE::ExternalMemoryHandleTypeFlagBits handleType,
HANDLE hTargetProcess,
HANDLE* pHandle) const VULKAN_HPP_NOEXCEPT;

#endif
#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
// wrapper function for command vmaMapMemory, see https://gpuopen-librariesandsdks.github.io/VulkanMemoryAllocator/html/globals_func.html
Expand Down Expand Up @@ -654,6 +687,28 @@ namespace VMA_HPP_NAMESPACE {
Allocation* pAllocation,
AllocationInfo* pAllocationInfo) const VULKAN_HPP_NOEXCEPT;

#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
// wrapper function for command vmaCreateDedicatedBuffer, see https://gpuopen-librariesandsdks.github.io/VulkanMemoryAllocator/html/globals_func.html
VULKAN_HPP_NODISCARD typename VULKAN_HPP_NAMESPACE::ResultValueType<std::pair<Allocation, VULKAN_HPP_NAMESPACE::Buffer>>::type createDedicatedBuffer(const VULKAN_HPP_NAMESPACE::BufferCreateInfo& bufferCreateInfo,
const AllocationCreateInfo& allocationCreateInfo,
void* memoryAllocateNext,
VULKAN_HPP_NAMESPACE::Optional<AllocationInfo> const & allocationInfo = nullptr) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
#ifndef VULKAN_HPP_NO_SMART_HANDLE
// wrapper function for command vmaCreateDedicatedBuffer, see https://gpuopen-librariesandsdks.github.io/VulkanMemoryAllocator/html/globals_func.html
VULKAN_HPP_NODISCARD typename VULKAN_HPP_NAMESPACE::ResultValueType<std::pair<UniqueAllocation, UniqueBuffer>>::type createDedicatedBufferUnique(const VULKAN_HPP_NAMESPACE::BufferCreateInfo& bufferCreateInfo,
const AllocationCreateInfo& allocationCreateInfo,
void* memoryAllocateNext,
VULKAN_HPP_NAMESPACE::Optional<AllocationInfo> const & allocationInfo = nullptr) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
#endif
#endif
// wrapper function for command vmaCreateDedicatedBuffer, see https://gpuopen-librariesandsdks.github.io/VulkanMemoryAllocator/html/globals_func.html
VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::Result createDedicatedBuffer(const VULKAN_HPP_NAMESPACE::BufferCreateInfo* pBufferCreateInfo,
const AllocationCreateInfo* pAllocationCreateInfo,
void* pMemoryAllocateNext,
VULKAN_HPP_NAMESPACE::Buffer* pBuffer,
Allocation* pAllocation,
AllocationInfo* pAllocationInfo) const VULKAN_HPP_NOEXCEPT;

#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
// wrapper function for command vmaCreateAliasingBuffer, see https://gpuopen-librariesandsdks.github.io/VulkanMemoryAllocator/html/globals_func.html
VULKAN_HPP_NODISCARD typename VULKAN_HPP_NAMESPACE::ResultValueType<VULKAN_HPP_NAMESPACE::Buffer>::type createAliasingBuffer(Allocation allocation,
Expand Down Expand Up @@ -726,6 +781,28 @@ namespace VMA_HPP_NAMESPACE {
Allocation* pAllocation,
AllocationInfo* pAllocationInfo) const VULKAN_HPP_NOEXCEPT;

#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
// wrapper function for command vmaCreateDedicatedImage, see https://gpuopen-librariesandsdks.github.io/VulkanMemoryAllocator/html/globals_func.html
VULKAN_HPP_NODISCARD typename VULKAN_HPP_NAMESPACE::ResultValueType<std::pair<Allocation, VULKAN_HPP_NAMESPACE::Image>>::type createDedicatedImage(const VULKAN_HPP_NAMESPACE::ImageCreateInfo& imageCreateInfo,
const AllocationCreateInfo& allocationCreateInfo,
void* memoryAllocateNext,
VULKAN_HPP_NAMESPACE::Optional<AllocationInfo> const & allocationInfo = nullptr) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
#ifndef VULKAN_HPP_NO_SMART_HANDLE
// wrapper function for command vmaCreateDedicatedImage, see https://gpuopen-librariesandsdks.github.io/VulkanMemoryAllocator/html/globals_func.html
VULKAN_HPP_NODISCARD typename VULKAN_HPP_NAMESPACE::ResultValueType<std::pair<UniqueAllocation, UniqueImage>>::type createDedicatedImageUnique(const VULKAN_HPP_NAMESPACE::ImageCreateInfo& imageCreateInfo,
const AllocationCreateInfo& allocationCreateInfo,
void* memoryAllocateNext,
VULKAN_HPP_NAMESPACE::Optional<AllocationInfo> const & allocationInfo = nullptr) const VULKAN_HPP_NOEXCEPT_WHEN_NO_EXCEPTIONS;
#endif
#endif
// wrapper function for command vmaCreateDedicatedImage, see https://gpuopen-librariesandsdks.github.io/VulkanMemoryAllocator/html/globals_func.html
VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::Result createDedicatedImage(const VULKAN_HPP_NAMESPACE::ImageCreateInfo* pImageCreateInfo,
const AllocationCreateInfo* pAllocationCreateInfo,
void* pMemoryAllocateNext,
VULKAN_HPP_NAMESPACE::Image* pImage,
Allocation* pAllocation,
AllocationInfo* pAllocationInfo) const VULKAN_HPP_NOEXCEPT;

#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
// wrapper function for command vmaCreateAliasingImage, see https://gpuopen-librariesandsdks.github.io/VulkanMemoryAllocator/html/globals_func.html
VULKAN_HPP_NODISCARD typename VULKAN_HPP_NAMESPACE::ResultValueType<VULKAN_HPP_NAMESPACE::Image>::type createAliasingImage(Allocation allocation,
Expand Down
Loading