From 0d9c0a3903accd0395822dba46fe0790bed73fa3 Mon Sep 17 00:00:00 2001 From: Tatsuyuki Ishi Date: Tue, 17 May 2022 20:57:12 +0900 Subject: [PATCH] vkd3d: Fix aligned_alloc ASan errors on native. Signed-off-by: Tatsuyuki Ishi --- include/private/vkd3d_memory.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/include/private/vkd3d_memory.h b/include/private/vkd3d_memory.h index 794df608..f8020780 100644 --- a/include/private/vkd3d_memory.h +++ b/include/private/vkd3d_memory.h @@ -23,6 +23,7 @@ #include #include +#include "vkd3d_common.h" #include "vkd3d_debug.h" static inline void *vkd3d_malloc(size_t size) @@ -57,12 +58,12 @@ static inline void vkd3d_free(void *ptr) bool vkd3d_array_reserve(void **elements, size_t *capacity, size_t element_count, size_t element_size); -static inline void *vkd3d_malloc_aligned(size_t size, size_t align) +static inline void *vkd3d_malloc_aligned(size_t size, size_t alignment) { #ifdef _WIN32 - return _aligned_malloc(size, align); + return _aligned_malloc(size, alignment); #else - return aligned_alloc(align, size); + return aligned_alloc(alignment, align(size, alignment)); #endif }