From 7549d70fbf3cf41f93e1c16d2feee4669ee0332c Mon Sep 17 00:00:00 2001 From: Philip Rebohle Date: Thu, 11 Feb 2021 16:06:21 +0100 Subject: [PATCH] vkd3d: Fix compiler errors when using vkd3d_atomic_ptr_store_explicit. Atomic stores do not return anything, so we cannot cast to void* here. Signed-off-by: Philip Rebohle --- include/private/vkd3d_atomic.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/private/vkd3d_atomic.h b/include/private/vkd3d_atomic.h index eda64a71..70bc7286 100644 --- a/include/private/vkd3d_atomic.h +++ b/include/private/vkd3d_atomic.h @@ -255,7 +255,7 @@ static inline uint64_t vkd3d_atomic_uint64_compare_exchange(uint64_t* target, ui #if defined(__x86_64__) || defined(_WIN64) # define vkd3d_atomic_ptr_load_explicit(target, order) ((void *)vkd3d_atomic_uint64_load_explicit((uint64_t *)target, order)) -# define vkd3d_atomic_ptr_store_explicit(target, value, order) ((void *)vkd3d_atomic_uint64_store_explicit((uint64_t *)target, value, order)) +# define vkd3d_atomic_ptr_store_explicit(target, value, order) (vkd3d_atomic_uint64_store_explicit((uint64_t *)target, value, order)) # define vkd3d_atomic_ptr_exchange_explicit(target, value, order) ((void *)vkd3d_atomic_uint64_exchange_explicit((uint64_t *)target, value, order)) # define vkd3d_atomic_ptr_increment(target, order) ((void *)vkd3d_atomic_uint64_increment((uint64_t *)target, order)) # define vkd3d_atomic_ptr_decrement(target, order) ((void *)vkd3d_atomic_uint64_decrement((uint64_t *)target, order)) @@ -263,7 +263,7 @@ static inline uint64_t vkd3d_atomic_uint64_compare_exchange(uint64_t* target, ui ((void *)vkd3d_atomic_uint64_compare_exchange((uint64_t *)target, (uint64_t)expected, (uint64_t)desired, success_order, fail_order)) #else # define vkd3d_atomic_ptr_load_explicit(target, order) ((void *)vkd3d_atomic_uint32_load_explicit((uint32_t *)target, order)) -# define vkd3d_atomic_ptr_store_explicit(target, value, order) ((void *)vkd3d_atomic_uint32_store_explicit((uint32_t *)target, value, order)) +# define vkd3d_atomic_ptr_store_explicit(target, value, order) (vkd3d_atomic_uint32_store_explicit((uint32_t *)target, value, order)) # define vkd3d_atomic_ptr_exchange_explicit(target, value, order) ((void *)vkd3d_atomic_uint32_exchange_explicit((uint32_t *)target, value, order)) # define vkd3d_atomic_ptr_increment(target, order) ((void *)vkd3d_atomic_uint32_increment((uint32_t *)target, order)) # define vkd3d_atomic_ptr_decrement(target, order) ((void *)vkd3d_atomic_uint32_decrement((uint32_t *)target, order))