AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vulkan/util: Add a type parameter to vk_multialloc_add

Browse Source 
We also switch from using __alignof__ to alignof() in util/macros.h
which works on MSVC with the one unfortunate downside of requiring an
actual type and not a value.

Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9511>
This commit is contained in:
Jason Ekstrand
2021-03-10 20:26:22 -06:00
parent c120edd8e8
commit 492b5577f0
3 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vulkan/util/vk_alloc.h
+12 -7
View File
@@ -156,8 +156,8 @@ struct vk_multialloc {
struct vk_multialloc _name = VK_MULTIALLOC_INIT
static ALWAYS_INLINE void
_vk_multialloc_add(struct vk_multialloc *ma,
void **ptr, size_t size, size_t align)
vk_multialloc_add_size_align(struct vk_multialloc *ma,
void **ptr, size_t size, size_t align)
{
assert(util_is_power_of_two_nonzero(align));
if (size == 0) {
@@ -176,15 +176,20 @@ _vk_multialloc_add(struct vk_multialloc *ma,
ma->ptrs[ma->ptr_count++] = ptr;
}
#define vk_multialloc_add_size(_ma, _ptr, _size) \
_vk_multialloc_add((_ma), (void **)(_ptr), (_size), __alignof__(**(_ptr)))
#define vk_multialloc_add_size(_ma, _ptr, _type, _size) \
do { \
_type **_tmp = (_ptr); \
(void)_tmp; \
vk_multialloc_add_size_align((_ma), (void **)(_ptr), \
(_size), alignof(_type)); \
} while(0)
#define vk_multialloc_add(_ma, _ptr, _count) \
vk_multialloc_add_size(_ma, _ptr, (_count) * sizeof(**(_ptr)));
#define vk_multialloc_add(_ma, _ptr, _type, _count) \
vk_multialloc_add_size(_ma, _ptr, _type, (_count) * sizeof(**(_ptr)));
#define VK_MULTIALLOC_DECL_SIZE(_ma, _type, _name, _size) \
_type *_name; \
vk_multialloc_add_size(_ma, &_name, _size);
vk_multialloc_add_size(_ma, &_name, _type, _size);
#define VK_MULTIALLOC_DECL(_ma, _type, _name, _count) \
VK_MULTIALLOC_DECL_SIZE(_ma, _type, _name, (_count) * sizeof(_type));