diff options
| author | Dave Airlie <[email protected]> | 2016-10-14 13:36:45 +1000 |
|---|---|---|
| committer | Dave Airlie <[email protected]> | 2016-10-19 09:05:26 +1000 |
| commit | 4450f405195d77f8bcc3fbd3e590405c8f540fab (patch) | |
| tree | ec931282a17a12fec97a7d0f4bfe61d49ca7b8b2 /src/amd/vulkan/radv_pipeline.c | |
| parent | 1ae6ece9802e77ede97722c0f7cdd0c24e6fbd04 (diff) | |
radv: move to using shared vk_alloc inlines.
This moves to the shared vk_alloc inlines for vulkan
memory allocations.
Acked-by: Jason Ekstrand <[email protected]>
Signed-off-by: Dave Airlie <[email protected]>
Diffstat (limited to 'src/amd/vulkan/radv_pipeline.c')
| -rw-r--r-- | src/amd/vulkan/radv_pipeline.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/amd/vulkan/radv_pipeline.c b/src/amd/vulkan/radv_pipeline.c index eb64b6972ab..78efbbe1c74 100644 --- a/src/amd/vulkan/radv_pipeline.c +++ b/src/amd/vulkan/radv_pipeline.c @@ -73,7 +73,7 @@ VkResult radv_CreateShaderModule( 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 @@ void radv_DestroyShaderModule( if (!module) return; - radv_free2(&device->alloc, pAllocator, module); + vk_free2(&device->alloc, pAllocator, module); } void radv_DestroyPipeline( @@ -119,7 +119,7 @@ void radv_DestroyPipeline( 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 @@ radv_graphics_pipeline_create( 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 @@ radv_graphics_pipeline_create( 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 @@ static VkResult radv_compute_pipeline_create( 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); |