diff options
| author | Matias N. Goldberg <dark_sylinc@yahoo.com.ar> | 2024-08-22 23:31:25 -0300 |
|---|---|---|
| committer | Matias N. Goldberg <dark_sylinc@yahoo.com.ar> | 2024-08-23 12:52:47 -0300 |
| commit | 38ae58bda27998b9e1cacdbcb09b4152cbc26768 (patch) | |
| tree | c8761bb7acb75fedd8a29091109aa86afee06615 /drivers | |
| parent | 568589c9d8c763bfb3a4348174d53b42d7c59f21 (diff) | |
| download | redot-engine-38ae58bda27998b9e1cacdbcb09b4152cbc26768.tar.gz | |
Fix build error in arm32
Fixes #95973
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/vulkan/rendering_context_driver_vulkan.cpp | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/drivers/vulkan/rendering_context_driver_vulkan.cpp b/drivers/vulkan/rendering_context_driver_vulkan.cpp index 6ffbb91516..7db79bddd3 100644 --- a/drivers/vulkan/rendering_context_driver_vulkan.cpp +++ b/drivers/vulkan/rendering_context_driver_vulkan.cpp @@ -229,6 +229,13 @@ VkAllocationCallbacks *RenderingContextDriverVulkan::get_allocation_callbacks(Vk #if !defined(VK_TRACK_DRIVER_MEMORY) return nullptr; #else + +#ifdef _MSC_VER +#define LAMBDA_VK_CALL_CONV +#else +#define LAMBDA_VK_CALL_CONV VKAPI_PTR +#endif + struct TrackedMemHeader { size_t size; VkSystemAllocationScope allocation_scope; @@ -241,7 +248,7 @@ VkAllocationCallbacks *RenderingContextDriverVulkan::get_allocation_callbacks(Vk void *p_user_data, size_t size, size_t alignment, - VkSystemAllocationScope allocation_scope) -> void * { + VkSystemAllocationScope allocation_scope) LAMBDA_VK_CALL_CONV -> void * { static constexpr size_t tracking_data_size = 32; VkTrackedObjectType type = static_cast<VkTrackedObjectType>(*reinterpret_cast<VkTrackedObjectType *>(p_user_data)); @@ -274,7 +281,7 @@ VkAllocationCallbacks *RenderingContextDriverVulkan::get_allocation_callbacks(Vk void *p_original, size_t size, size_t alignment, - VkSystemAllocationScope allocation_scope) -> void * { + VkSystemAllocationScope allocation_scope) LAMBDA_VK_CALL_CONV -> void * { if (p_original == nullptr) { VkObjectType type = static_cast<VkObjectType>(*reinterpret_cast<uint32_t *>(p_user_data)); return get_allocation_callbacks(type)->pfnAllocation(p_user_data, size, alignment, allocation_scope); @@ -305,7 +312,7 @@ VkAllocationCallbacks *RenderingContextDriverVulkan::get_allocation_callbacks(Vk // Free function []( void *p_user_data, - void *p_memory) { + void *p_memory) LAMBDA_VK_CALL_CONV { if (!p_memory) { return; } @@ -326,13 +333,13 @@ VkAllocationCallbacks *RenderingContextDriverVulkan::get_allocation_callbacks(Vk void *p_user_data, size_t size, VkInternalAllocationType allocation_type, - VkSystemAllocationScope allocation_scope) { + VkSystemAllocationScope allocation_scope) LAMBDA_VK_CALL_CONV { }, []( void *p_user_data, size_t size, VkInternalAllocationType allocation_type, - VkSystemAllocationScope allocation_scope) { + VkSystemAllocationScope allocation_scope) LAMBDA_VK_CALL_CONV { }, }; |