radv: move to using shared vk_alloc inlines.

This moves to the shared vk_alloc inlines for vulkan
memory allocations.

Acked-by: Jason Ekstrand <jason@jlekstrand.net>
Signed-off-by: Dave Airlie <airlied@redhat.com>

1 files changed, 19 insertions, 19 deletions

diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c
index 71b1481..af5a151 100644
--- a/src/amd/vulkan/radv_device.c
+++ b/src/amd/vulkan/radv_device.c
@@ -203,7 +203,7 @@ VkResult radv_CreateInstance(
 			return vk_error(VK_ERROR_EXTENSION_NOT_PRESENT);
 	}
 
-	instance = radv_alloc2(&default_alloc, pAllocator, sizeof(*instance), 8,
+	instance = vk_alloc2(&default_alloc, pAllocator, sizeof(*instance), 8,
 			       VK_SYSTEM_ALLOCATION_SCOPE_INSTANCE);
 	if (!instance)
 		return vk_error(VK_ERROR_OUT_OF_HOST_MEMORY);
@@ -243,7 +243,7 @@ void radv_DestroyInstance(
 
 	_mesa_locale_fini();
 
-	radv_free(&instance->alloc, instance);
+	vk_free(&instance->alloc, instance);
 }
 
 VkResult radv_EnumeratePhysicalDevices(
@@ -594,7 +594,7 @@ VkResult radv_CreateDevice(
 			return vk_error(VK_ERROR_EXTENSION_NOT_PRESENT);
 	}
 
-	device = radv_alloc2(&physical_device->instance->alloc, pAllocator,
+	device = vk_alloc2(&physical_device->instance->alloc, pAllocator,
 			     sizeof(*device), 8,
 			     VK_SYSTEM_ALLOCATION_SCOPE_DEVICE);
 	if (!device)
@@ -637,7 +637,7 @@ VkResult radv_CreateDevice(
 	*pDevice = radv_device_to_handle(device);
 	return VK_SUCCESS;
 fail_free:
-	radv_free(&device->alloc, device);
+	vk_free(&device->alloc, device);
 	return result;
 }
 
@@ -651,7 +651,7 @@ void radv_DestroyDevice(
 	radv_queue_finish(&device->queue);
 	radv_device_finish_meta(device);
 
-	radv_free(&device->alloc, device);
+	vk_free(&device->alloc, device);
 }
 
 VkResult radv_EnumerateInstanceExtensionProperties(
@@ -854,7 +854,7 @@ VkResult radv_AllocateMemory(
 		return VK_SUCCESS;
 	}
 
-	mem = radv_alloc2(&device->alloc, pAllocator, sizeof(*mem), 8,
+	mem = vk_alloc2(&device->alloc, pAllocator, sizeof(*mem), 8,
 			  VK_SYSTEM_ALLOCATION_SCOPE_OBJECT);
 	if (mem == NULL)
 		return vk_error(VK_ERROR_OUT_OF_HOST_MEMORY);
@@ -883,7 +883,7 @@ VkResult radv_AllocateMemory(
 	return VK_SUCCESS;
 
 fail:
-	radv_free2(&device->alloc, pAllocator, mem);
+	vk_free2(&device->alloc, pAllocator, mem);
 
 	return result;
 }
@@ -902,7 +902,7 @@ void radv_FreeMemory(
 	device->ws->buffer_destroy(mem->bo);
 	mem->bo = NULL;
 
-	radv_free2(&device->alloc, pAllocator, mem);
+	vk_free2(&device->alloc, pAllocator, mem);
 }
 
 VkResult radv_MapMemory(
@@ -1076,7 +1076,7 @@ VkResult radv_CreateFence(
 	VkFence*                                    pFence)
 {
 	RADV_FROM_HANDLE(radv_device, device, _device);
-	struct radv_fence *fence = radv_alloc2(&device->alloc, pAllocator,
+	struct radv_fence *fence = vk_alloc2(&device->alloc, pAllocator,
 					       sizeof(*fence), 8,
 					       VK_SYSTEM_ALLOCATION_SCOPE_OBJECT);
 
@@ -1105,7 +1105,7 @@ void radv_DestroyFence(
 	if (!fence)
 		return;
 	device->ws->destroy_fence(fence->fence);
-	radv_free2(&device->alloc, pAllocator, fence);
+	vk_free2(&device->alloc, pAllocator, fence);
 }
 
 static uint64_t radv_get_absolute_timeout(uint64_t timeout)
@@ -1213,7 +1213,7 @@ VkResult radv_CreateEvent(
 	VkEvent*                                    pEvent)
 {
 	RADV_FROM_HANDLE(radv_device, device, _device);
-	struct radv_event *event = radv_alloc2(&device->alloc, pAllocator,
+	struct radv_event *event = vk_alloc2(&device->alloc, pAllocator,
 					       sizeof(*event), 8,
 					       VK_SYSTEM_ALLOCATION_SCOPE_OBJECT);
 
@@ -1224,7 +1224,7 @@ VkResult radv_CreateEvent(
 					      RADEON_DOMAIN_GTT,
 					      RADEON_FLAG_CPU_ACCESS);
 	if (!event->bo) {
-		radv_free2(&device->alloc, pAllocator, event);
+		vk_free2(&device->alloc, pAllocator, event);
 		return VK_ERROR_OUT_OF_DEVICE_MEMORY;
 	}
 
@@ -1246,7 +1246,7 @@ void radv_DestroyEvent(
 	if (!event)
 		return;
 	device->ws->buffer_destroy(event->bo);
-	radv_free2(&device->alloc, pAllocator, event);
+	vk_free2(&device->alloc, pAllocator, event);
 }
 
 VkResult radv_GetEventStatus(
@@ -1291,7 +1291,7 @@ VkResult radv_CreateBuffer(
 
 	assert(pCreateInfo->sType == VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO);
 
-	buffer = radv_alloc2(&device->alloc, pAllocator, sizeof(*buffer), 8,
+	buffer = vk_alloc2(&device->alloc, pAllocator, sizeof(*buffer), 8,
 			     VK_SYSTEM_ALLOCATION_SCOPE_OBJECT);
 	if (buffer == NULL)
 		return vk_error(VK_ERROR_OUT_OF_HOST_MEMORY);
@@ -1317,7 +1317,7 @@ void radv_DestroyBuffer(
 	if (!buffer)
 		return;
 
-	radv_free2(&device->alloc, pAllocator, buffer);
+	vk_free2(&device->alloc, pAllocator, buffer);
 }
 
 static inline unsigned
@@ -1602,7 +1602,7 @@ VkResult radv_CreateFramebuffer(
 
 	size_t size = sizeof(*framebuffer) +
 		sizeof(struct radv_attachment_info) * pCreateInfo->attachmentCount;
-	framebuffer = radv_alloc2(&device->alloc, pAllocator, size, 8,
+	framebuffer = vk_alloc2(&device->alloc, pAllocator, size, 8,
 				  VK_SYSTEM_ALLOCATION_SCOPE_OBJECT);
 	if (framebuffer == NULL)
 		return vk_error(VK_ERROR_OUT_OF_HOST_MEMORY);
@@ -1637,7 +1637,7 @@ void radv_DestroyFramebuffer(
 
 	if (!fb)
 		return;
-	radv_free2(&device->alloc, pAllocator, fb);
+	vk_free2(&device->alloc, pAllocator, fb);
 }
 
 static unsigned radv_tex_wrap(VkSamplerAddressMode address_mode)
@@ -1777,7 +1777,7 @@ VkResult radv_CreateSampler(
 
 	assert(pCreateInfo->sType == VK_STRUCTURE_TYPE_SAMPLER_CREATE_INFO);
 
-	sampler = radv_alloc2(&device->alloc, pAllocator, sizeof(*sampler), 8,
+	sampler = vk_alloc2(&device->alloc, pAllocator, sizeof(*sampler), 8,
 			      VK_SYSTEM_ALLOCATION_SCOPE_OBJECT);
 	if (!sampler)
 		return vk_error(VK_ERROR_OUT_OF_HOST_MEMORY);
@@ -1798,5 +1798,5 @@ void radv_DestroySampler(
 
 	if (!sampler)
 		return;
-	radv_free2(&device->alloc, pAllocator, sampler);
+	vk_free2(&device->alloc, pAllocator, sampler);
 }