From f90e2af99661b606aee99ed84204b3bfea235a59 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Wed, 31 Aug 2022 13:33:07 -0500 Subject: [PATCH] vulkan: Re-order arguments to vk_command_pool_init Most other init functions follow the Vulkan API convention of putting the parent object first. Part-of: --- src/amd/vulkan/radv_cmd_buffer.c | 2 +- src/freedreno/vulkan/tu_cmd_buffer.c | 2 +- src/gallium/frontends/lavapipe/lvp_cmd_buffer.c | 2 +- src/panfrost/vulkan/panvk_cmd_buffer.c | 2 +- src/vulkan/runtime/vk_command_pool.c | 6 +++--- src/vulkan/runtime/vk_command_pool.h | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c index 6842ed6d599..1eab57525e0 100644 --- a/src/amd/vulkan/radv_cmd_buffer.c +++ b/src/amd/vulkan/radv_cmd_buffer.c @@ -6117,7 +6117,7 @@ radv_CreateCommandPool(VkDevice _device, const VkCommandPoolCreateInfo *pCreateI if (pool == NULL) return vk_error(device, VK_ERROR_OUT_OF_HOST_MEMORY); - VkResult result = vk_command_pool_init(&pool->vk, &device->vk, pCreateInfo, pAllocator); + VkResult result = vk_command_pool_init(&device->vk, &pool->vk, pCreateInfo, pAllocator); if (result != VK_SUCCESS) { vk_free2(&device->vk.alloc, pAllocator, pool); return result; diff --git a/src/freedreno/vulkan/tu_cmd_buffer.c b/src/freedreno/vulkan/tu_cmd_buffer.c index df451b188bd..8bcc53ab114 100644 --- a/src/freedreno/vulkan/tu_cmd_buffer.c +++ b/src/freedreno/vulkan/tu_cmd_buffer.c @@ -3810,7 +3810,7 @@ tu_CreateCommandPool(VkDevice _device, if (pool == NULL) return vk_error(device, VK_ERROR_OUT_OF_HOST_MEMORY); - VkResult result = vk_command_pool_init(&pool->vk, &device->vk, + VkResult result = vk_command_pool_init(&device->vk, &pool->vk, pCreateInfo, pAllocator); if (result != VK_SUCCESS) { vk_free2(&device->vk.alloc, pAllocator, pool); diff --git a/src/gallium/frontends/lavapipe/lvp_cmd_buffer.c b/src/gallium/frontends/lavapipe/lvp_cmd_buffer.c index 10b8ebd52ee..8303bbd2760 100644 --- a/src/gallium/frontends/lavapipe/lvp_cmd_buffer.c +++ b/src/gallium/frontends/lavapipe/lvp_cmd_buffer.c @@ -192,7 +192,7 @@ VKAPI_ATTR VkResult VKAPI_CALL lvp_CreateCommandPool( if (pool == NULL) return vk_error(device, VK_ERROR_OUT_OF_HOST_MEMORY); - VkResult result = vk_command_pool_init(&pool->vk, &device->vk, + VkResult result = vk_command_pool_init(&device->vk, &pool->vk, pCreateInfo, pAllocator); if (result != VK_SUCCESS) { vk_free2(&device->vk.alloc, pAllocator, pool); diff --git a/src/panfrost/vulkan/panvk_cmd_buffer.c b/src/panfrost/vulkan/panvk_cmd_buffer.c index 82d7a86cdef..bfc816edd1c 100644 --- a/src/panfrost/vulkan/panvk_cmd_buffer.c +++ b/src/panfrost/vulkan/panvk_cmd_buffer.c @@ -381,7 +381,7 @@ panvk_CreateCommandPool(VkDevice _device, if (pool == NULL) return vk_error(device, VK_ERROR_OUT_OF_HOST_MEMORY); - VkResult result = vk_command_pool_init(&pool->vk, &device->vk, + VkResult result = vk_command_pool_init(&device->vk, &pool->vk, pCreateInfo, pAllocator); if (result != VK_SUCCESS) { vk_free2(&device->vk.alloc, pAllocator, pool); diff --git a/src/vulkan/runtime/vk_command_pool.c b/src/vulkan/runtime/vk_command_pool.c index f4f5ff4decb..a5f565a8cfb 100644 --- a/src/vulkan/runtime/vk_command_pool.c +++ b/src/vulkan/runtime/vk_command_pool.c @@ -31,8 +31,8 @@ #include "vk_log.h" VkResult MUST_CHECK -vk_command_pool_init(struct vk_command_pool *pool, - struct vk_device *device, +vk_command_pool_init(struct vk_device *device, + struct vk_command_pool *pool, const VkCommandPoolCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator) { @@ -75,7 +75,7 @@ vk_common_CreateCommandPool(VkDevice _device, if (pool == NULL) return vk_error(device, VK_ERROR_OUT_OF_HOST_MEMORY); - result = vk_command_pool_init(pool, device, pCreateInfo, pAllocator); + result = vk_command_pool_init(device, pool, pCreateInfo, pAllocator); if (unlikely(result != VK_SUCCESS)) { vk_free2(&device->alloc, pAllocator, pool); return result; diff --git a/src/vulkan/runtime/vk_command_pool.h b/src/vulkan/runtime/vk_command_pool.h index 9ee4154309b..08c0785179f 100644 --- a/src/vulkan/runtime/vk_command_pool.h +++ b/src/vulkan/runtime/vk_command_pool.h @@ -51,8 +51,8 @@ VK_DEFINE_NONDISP_HANDLE_CASTS(vk_command_pool, base, VkCommandPool, VK_OBJECT_TYPE_COMMAND_POOL) VkResult MUST_CHECK -vk_command_pool_init(struct vk_command_pool *pool, - struct vk_device *device, +vk_command_pool_init(struct vk_device *device, + struct vk_command_pool *pool, const VkCommandPoolCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator);