Module: Mesa Branch: master Commit: 5afdbfe0c84896bc9cec74a5248f7201b5e91fbf URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5afdbfe0c84896bc9cec74a5248f7201b5e91fbf
Author: Jason Ekstrand <[email protected]> Date: Wed Mar 10 20:17:57 2021 -0600 vk/alloc: Handle zero sizes better in vk_multialloc_add Reviewed-by: Jesse Natalie <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9511> --- src/vulkan/util/vk_alloc.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/vulkan/util/vk_alloc.h b/src/vulkan/util/vk_alloc.h index 9620d7cdcc9..4a502de96e5 100644 --- a/src/vulkan/util/vk_alloc.h +++ b/src/vulkan/util/vk_alloc.h @@ -160,6 +160,11 @@ _vk_multialloc_add(struct vk_multialloc *ma, void **ptr, size_t size, size_t align) { assert(util_is_power_of_two_nonzero(align)); + if (size == 0) { + *ptr = NULL; + return; + } + size_t offset = ALIGN_POT(ma->size, align); ma->size = offset + size; ma->align = MAX2(ma->align, align); _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
