Mesa (main): vulkan: do not depend on alignof(void)

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: d217fb9b0a7d0d3ad5ab4950c65b6633bf20e91c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d217fb9b0a7d0d3ad5ab4950c65b6633bf20e91c

Author: Erik Faye-Lund <erik.faye-lund at collabora.com>
Date:   Mon Apr 25 10:36:51 2022 +0200

vulkan: do not depend on alignof(void)

alignof(void) is a non-standard GCC extension, and it doesn't compile on
MSVC. But since the Windows CI has been disabled due to stability
issues, a breakage snuk in nevertheless.

Since alignof(char) works the same as alignof(void), let's pass char
instead of void here. That hides the GCC weirdness without doing any
functional changes.

Fixes: 591da987790 ("vulkan: Add a common VkPipelineCache implementation")
Reviewed-by: Boris Brezillon <boris.brezillon at collabora.com>
Reviewed-by: Jason Ekstrand <jason.ekstrand at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16134>

---

 src/vulkan/runtime/vk_pipeline_cache.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/vulkan/runtime/vk_pipeline_cache.c b/src/vulkan/runtime/vk_pipeline_cache.c
index e7068be26ff..dbb96ef1fe1 100644
--- a/src/vulkan/runtime/vk_pipeline_cache.c
+++ b/src/vulkan/runtime/vk_pipeline_cache.c
@@ -77,8 +77,8 @@ raw_data_object_create(struct vk_device *device,
 {
    VK_MULTIALLOC(ma);
    VK_MULTIALLOC_DECL(&ma, struct raw_data_object, data_obj, 1);
-   VK_MULTIALLOC_DECL_SIZE(&ma, void, obj_key_data, key_size);
-   VK_MULTIALLOC_DECL_SIZE(&ma, void, obj_data, data_size);
+   VK_MULTIALLOC_DECL_SIZE(&ma, char, obj_key_data, key_size);
+   VK_MULTIALLOC_DECL_SIZE(&ma, char, obj_data, data_size);
 
    if (!vk_multialloc_alloc(&ma, &device->alloc,
                             VK_SYSTEM_ALLOCATION_SCOPE_DEVICE))