diff options
author | RĂ©mi Verschelde <remi@verschelde.fr> | 2021-08-13 08:42:58 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-08-13 08:42:58 +0200 |
commit | 4c53669d8ab07b27cbf953840b3007357addb16b (patch) | |
tree | 271c5a2448b4b067eeeb05afd6045a881de0dc26 /thirdparty/vulkan/patches/VMA-assert-remove.patch | |
parent | d4c04a9b431da5c8797da900e89737d6a2da6413 (diff) | |
parent | 7b7e17a626392aee0850889e3487b282f0bbc9b6 (diff) |
Merge pull request #51524 from RandomShaper/faster_vma
Upgrade Vulkan Memory Allocator, use Volk on Android
Diffstat (limited to 'thirdparty/vulkan/patches/VMA-assert-remove.patch')
-rw-r--r-- | thirdparty/vulkan/patches/VMA-assert-remove.patch | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/thirdparty/vulkan/patches/VMA-assert-remove.patch b/thirdparty/vulkan/patches/VMA-assert-remove.patch deleted file mode 100644 index 3d57ab7d42..0000000000 --- a/thirdparty/vulkan/patches/VMA-assert-remove.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/thirdparty/vulkan/vk_mem_alloc.h b/thirdparty/vulkan/vk_mem_alloc.h -index 0dfb66efc6..8a42699e7f 100644 ---- a/thirdparty/vulkan/vk_mem_alloc.h -+++ b/thirdparty/vulkan/vk_mem_alloc.h -@@ -17508,24 +17508,6 @@ VMA_CALL_PRE VkResult VMA_CALL_POST vmaCreateBuffer( - allocator->GetBufferMemoryRequirements(*pBuffer, vkMemReq, - requiresDedicatedAllocation, prefersDedicatedAllocation); - -- // Make sure alignment requirements for specific buffer usages reported -- // in Physical Device Properties are included in alignment reported by memory requirements. -- if((pBufferCreateInfo->usage & VK_BUFFER_USAGE_UNIFORM_TEXEL_BUFFER_BIT) != 0) -- { -- VMA_ASSERT(vkMemReq.alignment % -- allocator->m_PhysicalDeviceProperties.limits.minTexelBufferOffsetAlignment == 0); -- } -- if((pBufferCreateInfo->usage & VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT) != 0) -- { -- VMA_ASSERT(vkMemReq.alignment % -- allocator->m_PhysicalDeviceProperties.limits.minUniformBufferOffsetAlignment == 0); -- } -- if((pBufferCreateInfo->usage & VK_BUFFER_USAGE_STORAGE_BUFFER_BIT) != 0) -- { -- VMA_ASSERT(vkMemReq.alignment % -- allocator->m_PhysicalDeviceProperties.limits.minStorageBufferOffsetAlignment == 0); -- } -- - // 3. Allocate memory using allocator. - res = allocator->AllocateMemory( - vkMemReq, |