commit 4450f405195d77f8bcc3fbd3e590405c8f540fab
author Dave Airlie <airlied@redhat.com> Fri Oct 14 13:36:45 2016 +1000
committer Dave Airlie <airlied@redhat.com> Wed Oct 19 09:05:26 2016 +1000
tree ec931282a17a12fec97a7d0f4bfe61d49ca7b8b2
parent 1ae6ece9802e77ede97722c0f7cdd0c24e6fbd04

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>

src/amd/vulkan/radv_pipeline.c

diff --git a/src/amd/vulkan/radv_pipeline.c b/src/amd/vulkan/radv_pipeline.c
index eb64b69..78efbbe 100644
--- a/src/amd/vulkan/radv_pipeline.c
+++ b/src/amd/vulkan/radv_pipeline.c
@@ -73,7 +73,7 @@
 	assert(pCreateInfo->sType == VK_STRUCTURE_TYPE_SHADER_MODULE_CREATE_INFO);
 	assert(pCreateInfo->flags == 0);
 
-	module = radv_alloc2(&device->alloc, pAllocator,
+	module = vk_alloc2(&device->alloc, pAllocator,
 			     sizeof(*module) + pCreateInfo->codeSize, 8,
 			     VK_SYSTEM_ALLOCATION_SCOPE_OBJECT);
 	if (module == NULL)
@@ -101,7 +101,7 @@
 	if (!module)
 		return;
 
-	radv_free2(&device->alloc, pAllocator, module);
+	vk_free2(&device->alloc, pAllocator, module);
 }
 
 void radv_DestroyPipeline(
@@ -119,7 +119,7 @@
 		if (pipeline->shaders[i])
 			radv_shader_variant_destroy(device, pipeline->shaders[i]);
 
-	radv_free2(&device->alloc, pAllocator, pipeline);
+	vk_free2(&device->alloc, pAllocator, pipeline);
 }
 
 
@@ -1302,7 +1302,7 @@
 	struct radv_pipeline *pipeline;
 	VkResult result;
 
-	pipeline = radv_alloc2(&device->alloc, pAllocator, sizeof(*pipeline), 8,
+	pipeline = vk_alloc2(&device->alloc, pAllocator, sizeof(*pipeline), 8,
 			       VK_SYSTEM_ALLOCATION_SCOPE_OBJECT);
 	if (pipeline == NULL)
 		return vk_error(VK_ERROR_OUT_OF_HOST_MEMORY);
@@ -1311,7 +1311,7 @@
 	result = radv_pipeline_init(pipeline, device, cache,
 				    pCreateInfo, extra, pAllocator);
 	if (result != VK_SUCCESS) {
-		radv_free2(&device->alloc, pAllocator, pipeline);
+		vk_free2(&device->alloc, pAllocator, pipeline);
 		return result;
 	}
 
@@ -1361,7 +1361,7 @@
 	struct radv_pipeline *pipeline;
 	bool dump = getenv("RADV_DUMP_SHADERS");
 
-	pipeline = radv_alloc2(&device->alloc, pAllocator, sizeof(*pipeline), 8,
+	pipeline = vk_alloc2(&device->alloc, pAllocator, sizeof(*pipeline), 8,
 			       VK_SYSTEM_ALLOCATION_SCOPE_OBJECT);
 	if (pipeline == NULL)
 		return vk_error(VK_ERROR_OUT_OF_HOST_MEMORY);