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_image.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_image.c')
| -rw-r--r-- | src/amd/vulkan/radv_image.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/amd/vulkan/radv_image.c b/src/amd/vulkan/radv_image.c index 0dc364cc396..710eda1d548 100644 --- a/src/amd/vulkan/radv_image.c +++ b/src/amd/vulkan/radv_image.c @@ -698,7 +698,7 @@ radv_image_create(VkDevice _device, radv_assert(pCreateInfo->extent.height > 0); radv_assert(pCreateInfo->extent.depth > 0); - image = radv_alloc2(&device->alloc, alloc, sizeof(*image), 8, + image = vk_alloc2(&device->alloc, alloc, sizeof(*image), 8, VK_SYSTEM_ALLOCATION_SCOPE_OBJECT); if (!image) return vk_error(VK_ERROR_OUT_OF_HOST_MEMORY); @@ -923,7 +923,7 @@ radv_DestroyImage(VkDevice _device, VkImage _image, if (!_image) return; - radv_free2(&device->alloc, pAllocator, radv_image_from_handle(_image)); + vk_free2(&device->alloc, pAllocator, radv_image_from_handle(_image)); } void radv_GetImageSubresourceLayout( @@ -955,7 +955,7 @@ radv_CreateImageView(VkDevice _device, RADV_FROM_HANDLE(radv_device, device, _device); struct radv_image_view *view; - view = radv_alloc2(&device->alloc, pAllocator, sizeof(*view), 8, + view = vk_alloc2(&device->alloc, pAllocator, sizeof(*view), 8, VK_SYSTEM_ALLOCATION_SCOPE_OBJECT); if (view == NULL) return vk_error(VK_ERROR_OUT_OF_HOST_MEMORY); @@ -976,7 +976,7 @@ radv_DestroyImageView(VkDevice _device, VkImageView _iview, if (!iview) return; - radv_free2(&device->alloc, pAllocator, iview); + vk_free2(&device->alloc, pAllocator, iview); } void radv_buffer_view_init(struct radv_buffer_view *view, @@ -1004,7 +1004,7 @@ radv_CreateBufferView(VkDevice _device, RADV_FROM_HANDLE(radv_device, device, _device); struct radv_buffer_view *view; - view = radv_alloc2(&device->alloc, pAllocator, sizeof(*view), 8, + view = vk_alloc2(&device->alloc, pAllocator, sizeof(*view), 8, VK_SYSTEM_ALLOCATION_SCOPE_OBJECT); if (!view) return vk_error(VK_ERROR_OUT_OF_HOST_MEMORY); @@ -1026,5 +1026,5 @@ radv_DestroyBufferView(VkDevice _device, VkBufferView bufferView, if (!view) return; - radv_free2(&device->alloc, pAllocator, view); + vk_free2(&device->alloc, pAllocator, view); } |