Mesa (main): vulkan/util: Add explicit casts to make c++ happy
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Fri Feb 4 10:52:24 UTC 2022
Module: Mesa
Branch: main
Commit: 0d0ecbd987e7b37af9ea2c7dbf33bf91d018a603
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=0d0ecbd987e7b37af9ea2c7dbf33bf91d018a603
Author: Erik Faye-Lund <kusmabite at gmail.com>
Date: Fri Feb 4 09:03:39 2022 +0100
vulkan/util: Add explicit casts to make c++ happy
We're about to need including this header from a C++ source, so let's
add some explicit casts for C++ compatibility.
In one case we can make things a bit cleaner by moving the
char-pointer-ism to the place that needs it, so let's clean that up
while we're at it.
Reviewed-by: Jason Ekstrand <jason.ekstrand at collabora.com>
Reviewed-by: Emma Anholt <emma at anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14850>
---
src/vulkan/util/vk_alloc.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/vulkan/util/vk_alloc.h b/src/vulkan/util/vk_alloc.h
index 18b0d73b052..8553237e8c7 100644
--- a/src/vulkan/util/vk_alloc.h
+++ b/src/vulkan/util/vk_alloc.h
@@ -234,7 +234,7 @@ vk_multialloc_alloc(struct vk_multialloc *ma,
const VkAllocationCallbacks *alloc,
VkSystemAllocationScope scope)
{
- char *ptr = (char *)vk_alloc(alloc, ma->size, ma->align, scope);
+ void *ptr = vk_alloc(alloc, ma->size, ma->align, scope);
if (!ptr)
return NULL;
@@ -250,7 +250,7 @@ vk_multialloc_alloc(struct vk_multialloc *ma,
STATIC_ASSERT(ARRAY_SIZE(ma->ptrs) == 8);
#define _VK_MULTIALLOC_UPDATE_POINTER(_i) \
if ((_i) < ma->ptr_count) \
- *ma->ptrs[_i] = ptr + (uintptr_t)*ma->ptrs[_i]
+ *ma->ptrs[_i] = (char *)ptr + (uintptr_t)*ma->ptrs[_i]
_VK_MULTIALLOC_UPDATE_POINTER(0);
_VK_MULTIALLOC_UPDATE_POINTER(1);
_VK_MULTIALLOC_UPDATE_POINTER(2);
More information about the mesa-commit
mailing list