X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Famd%2Fvulkan%2Fradv_descriptor_set.c;h=eb8b5d6e3a8e35f84897478c3a439a41d590aa51;hb=eca57f85ee1f47b32daa641a19d8d386c58eb1de;hp=3dea0750995ed2a984f8ef7b9ddf3fd4eb3e7f60;hpb=c6f1077e0d96400c89ad577e841b1851ab9e3349;p=mesa.git

diff --git a/src/amd/vulkan/radv_descriptor_set.c b/src/amd/vulkan/radv_descriptor_set.c
index 3dea0750995..eb8b5d6e3a8 100644
--- a/src/amd/vulkan/radv_descriptor_set.c
+++ b/src/amd/vulkan/radv_descriptor_set.c
@@ -54,7 +54,7 @@ VkResult radv_CreateDescriptorSetLayout(
 		(max_binding + 1) * sizeof(set_layout->binding[0]) +
 		immutable_sampler_count * sizeof(struct radv_sampler *);
 
-	set_layout = radv_alloc2(&device->alloc, pAllocator, size, 8,
+	set_layout = vk_alloc2(&device->alloc, pAllocator, size, 8,
 				 VK_SYSTEM_ALLOCATION_SCOPE_OBJECT);
 	if (!set_layout)
 		return vk_error(VK_ERROR_OUT_OF_HOST_MEMORY);
@@ -164,7 +164,7 @@ void radv_DestroyDescriptorSetLayout(
 	if (!set_layout)
 		return;
 
-	radv_free2(&device->alloc, pAllocator, set_layout);
+	vk_free2(&device->alloc, pAllocator, set_layout);
 }
 
 /*
@@ -184,7 +184,7 @@ VkResult radv_CreatePipelineLayout(
 
 	assert(pCreateInfo->sType == VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO);
 
-	layout = radv_alloc2(&device->alloc, pAllocator, sizeof(*layout), 8,
+	layout = vk_alloc2(&device->alloc, pAllocator, sizeof(*layout), 8,
 			     VK_SYSTEM_ALLOCATION_SCOPE_OBJECT);
 	if (layout == NULL)
 		return vk_error(VK_ERROR_OUT_OF_HOST_MEMORY);
@@ -235,7 +235,7 @@ void radv_DestroyPipelineLayout(
 
 	if (!pipeline_layout)
 		return;
-	radv_free2(&device->alloc, pAllocator, pipeline_layout);
+	vk_free2(&device->alloc, pAllocator, pipeline_layout);
 }
 
 #define EMPTY 1
@@ -250,7 +250,7 @@ radv_descriptor_set_create(struct radv_device *device,
 	struct radv_descriptor_set *set;
 	unsigned mem_size = sizeof(struct radv_descriptor_set) +
 		sizeof(struct radeon_winsys_bo *) * layout->buffer_count;
-	set = radv_alloc2(&device->alloc, NULL, mem_size, 8,
+	set = vk_alloc2(&device->alloc, NULL, mem_size, 8,
 			  VK_SYSTEM_ALLOCATION_SCOPE_OBJECT);
 
 	if (!set)
@@ -261,11 +261,11 @@ radv_descriptor_set_create(struct radv_device *device,
 	if (layout->dynamic_offset_count) {
 		unsigned size = sizeof(struct radv_descriptor_range) *
 		                layout->dynamic_offset_count;
-		set->dynamic_descriptors = radv_alloc2(&device->alloc, NULL, size, 8,
+		set->dynamic_descriptors = vk_alloc2(&device->alloc, NULL, size, 8,
 			                               VK_SYSTEM_ALLOCATION_SCOPE_OBJECT);
 
 		if (!set->dynamic_descriptors) {
-			radv_free2(&device->alloc, NULL, set);
+			vk_free2(&device->alloc, NULL, set);
 			return vk_error(VK_ERROR_OUT_OF_HOST_MEMORY);
 		}
 	}
@@ -297,7 +297,7 @@ radv_descriptor_set_create(struct radv_device *device,
 				}
 
 				if (entry < 0) {
-					radv_free2(&device->alloc, NULL, set);
+					vk_free2(&device->alloc, NULL, set);
 					return vk_error(VK_ERROR_OUT_OF_DEVICE_MEMORY);
 				}
 				offset = pool->free_nodes[entry].offset;
@@ -313,8 +313,8 @@ radv_descriptor_set_create(struct radv_device *device,
 			if (!radv_cmd_buffer_upload_alloc(cmd_buffer, set->size, 32,
 							  &bo_offset,
 							  (void**)&set->mapped_ptr)) {
-				radv_free2(&device->alloc, NULL, set->dynamic_descriptors);
-				radv_free2(&device->alloc, NULL, set);
+				vk_free2(&device->alloc, NULL, set->dynamic_descriptors);
+				vk_free2(&device->alloc, NULL, set);
 				return vk_error(VK_ERROR_OUT_OF_HOST_MEMORY);
 			}
 
@@ -364,10 +364,10 @@ radv_descriptor_set_destroy(struct radv_device *device,
 		pool->full_list = next;
 	}
 	if (set->dynamic_descriptors)
-		radv_free2(&device->alloc, NULL, set->dynamic_descriptors);
+		vk_free2(&device->alloc, NULL, set->dynamic_descriptors);
 	if (!list_empty(&set->descriptor_pool))
 		list_del(&set->descriptor_pool);
-	radv_free2(&device->alloc, NULL, set);
+	vk_free2(&device->alloc, NULL, set);
 }
 
 VkResult
@@ -406,7 +406,7 @@ VkResult radv_CreateDescriptorPool(
 	int size = sizeof(struct radv_descriptor_pool) +
 	           max_sets * sizeof(struct radv_descriptor_pool_free_node);
 	uint64_t bo_size = 0;
-	pool = radv_alloc2(&device->alloc, pAllocator, size, 8,
+	pool = vk_alloc2(&device->alloc, pAllocator, size, 8,
 			   VK_SYSTEM_ALLOCATION_SCOPE_OBJECT);
 	if (!pool)
 		return vk_error(VK_ERROR_OUT_OF_HOST_MEMORY);
@@ -478,7 +478,7 @@ void radv_DestroyDescriptorPool(
 
 	if (pool->bo)
 		device->ws->buffer_destroy(pool->bo);
-	radv_free2(&device->alloc, pAllocator, pool);
+	vk_free2(&device->alloc, pAllocator, pool);
 }
 
 VkResult radv_ResetDescriptorPool(