Module: Mesa Branch: main Commit: 7ebd658e28332d98a955cdb33ae8bccf7b5fd22c URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=7ebd658e28332d98a955cdb33ae8bccf7b5fd22c
Author: Chia-I Wu <[email protected]> Date: Tue Jun 1 09:34:10 2021 -0700 radv: use vk_default_allocator Signed-off-by: Chia-I Wu <[email protected]> Acked-by: Jason Ekstrand <[email protected]> Reviewed-by: Samuel Pitoiset <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11117> --- src/amd/vulkan/radv_device.c | 29 +---------------------------- 1 file changed, 1 insertion(+), 28 deletions(-) diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c index 9c4e9743fd5..19b9becdd27 100644 --- a/src/amd/vulkan/radv_device.c +++ b/src/amd/vulkan/radv_device.c @@ -739,33 +739,6 @@ radv_physical_device_destroy(struct radv_physical_device *device) vk_free(&device->instance->vk.alloc, device); } -static void * -default_alloc_func(void *pUserData, size_t size, size_t align, - VkSystemAllocationScope allocationScope) -{ - return malloc(size); -} - -static void * -default_realloc_func(void *pUserData, void *pOriginal, size_t size, size_t align, - VkSystemAllocationScope allocationScope) -{ - return realloc(pOriginal, size); -} - -static void -default_free_func(void *pUserData, void *pMemory) -{ - free(pMemory); -} - -static const VkAllocationCallbacks default_alloc = { - .pUserData = NULL, - .pfnAllocation = default_alloc_func, - .pfnReallocation = default_realloc_func, - .pfnFree = default_free_func, -}; - static const struct debug_control radv_debug_options[] = { {"nofastclears", RADV_DEBUG_NO_FAST_CLEARS}, {"nodcc", RADV_DEBUG_NO_DCC}, @@ -893,7 +866,7 @@ radv_CreateInstance(const VkInstanceCreateInfo *pCreateInfo, VkResult result; if (!pAllocator) - pAllocator = &default_alloc; + pAllocator = vk_default_allocator(); instance = vk_zalloc(pAllocator, sizeof(*instance), 8, VK_SYSTEM_ALLOCATION_SCOPE_INSTANCE); if (!instance) _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
