radv: use the common base object type for VkDevice

[mesa.git] / src / amd / vulkan / radv_pass.c

diff --git a/src/amd/vulkan/radv_pass.c b/src/amd/vulkan/radv_pass.c
index 4df3e81eead46eb0ac0f84a4ca389ee582e19303..41e8d3f4d0e724b1f73f705ea5bbcd63352c1d4b 100644 (file)
--- a/src/amd/vulkan/radv_pass.c
+++ b/src/amd/vulkan/radv_pass.c
@@ -319,7 +319,7 @@ VkResult radv_CreateRenderPass(
        attachments_offset = size;
        size += pCreateInfo->attachmentCount * sizeof(pass->attachments[0]);
 
-       pass = vk_alloc2(&device->alloc, pAllocator, size, 8,
+       pass = vk_alloc2(&device->vk.alloc, pAllocator, size, 8,
                           VK_SYSTEM_ALLOCATION_SCOPE_OBJECT);
        if (pass == NULL)
                return vk_error(device->instance, VK_ERROR_OUT_OF_HOST_MEMORY);
@@ -362,11 +362,11 @@ VkResult radv_CreateRenderPass(
 
        if (subpass_attachment_count) {
                pass->subpass_attachments =
-                       vk_alloc2(&device->alloc, pAllocator,
+                       vk_alloc2(&device->vk.alloc, pAllocator,
                                    subpass_attachment_count * sizeof(struct radv_subpass_attachment), 8,
                                    VK_SYSTEM_ALLOCATION_SCOPE_OBJECT);
                if (pass->subpass_attachments == NULL) {
-                       vk_free2(&device->alloc, pAllocator, pass);
+                       vk_free2(&device->vk.alloc, pAllocator, pass);
                        return vk_error(device->instance, VK_ERROR_OUT_OF_HOST_MEMORY);
                }
        } else
@@ -501,7 +501,7 @@ VkResult radv_CreateRenderPass2(
        attachments_offset = size;
        size += pCreateInfo->attachmentCount * sizeof(pass->attachments[0]);
 
-       pass = vk_alloc2(&device->alloc, pAllocator, size, 8,
+       pass = vk_alloc2(&device->vk.alloc, pAllocator, size, 8,
                           VK_SYSTEM_ALLOCATION_SCOPE_OBJECT);
        if (pass == NULL)
                return vk_error(device->instance, VK_ERROR_OUT_OF_HOST_MEMORY);
@@ -541,11 +541,11 @@ VkResult radv_CreateRenderPass2(
 
        if (subpass_attachment_count) {
                pass->subpass_attachments =
-                       vk_alloc2(&device->alloc, pAllocator,
+                       vk_alloc2(&device->vk.alloc, pAllocator,
                                    subpass_attachment_count * sizeof(struct radv_subpass_attachment), 8,
                                    VK_SYSTEM_ALLOCATION_SCOPE_OBJECT);
                if (pass->subpass_attachments == NULL) {
-                       vk_free2(&device->alloc, pAllocator, pass);
+                       vk_free2(&device->vk.alloc, pAllocator, pass);
                        return vk_error(device->instance, VK_ERROR_OUT_OF_HOST_MEMORY);
                }
        } else
@@ -681,8 +681,8 @@ void radv_DestroyRenderPass(
 
        if (!_pass)
                return;
-       vk_free2(&device->alloc, pAllocator, pass->subpass_attachments);
-       vk_free2(&device->alloc, pAllocator, pass);
+       vk_free2(&device->vk.alloc, pAllocator, pass->subpass_attachments);
+       vk_free2(&device->vk.alloc, pAllocator, pass);
 }
 
 void radv_GetRenderAreaGranularity(