fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-26 17:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

vulkan: Re-order arguments to vk_command_buffer_init

Browse source 
Most other init functions follow the Vulkan API convention of putting
the parent object first.

Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18324>
This commit is contained in:
Jason Ekstrand 2022-08-30 11:48:21 -05:00 • committed by Marge Bot
parent f90e2af996
commit 5c143b132a
10 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/amd/vulkan/radv_cmd_buffer.c
View file

@ -355,7 +355,7 @@ radv_create_cmd_buffer(struct radv_device *device, struct radv_cmd_pool *pool,
return vk_error(device, VK_ERROR_OUT_OF_HOST_MEMORY);
VkResult result =
vk_command_buffer_init(&cmd_buffer->vk, &pool->vk, level);
vk_command_buffer_init(&pool->vk, &cmd_buffer->vk, level);
if (result != VK_SUCCESS) {
vk_free(&cmd_buffer->pool->vk.alloc, cmd_buffer);
return result;
@ -4693,7 +4693,7 @@ radv_AllocateCommandBuffers(VkDevice _device, const VkCommandBufferAllocateInfo
result = radv_reset_cmd_buffer(cmd_buffer);
vk_command_buffer_finish(&cmd_buffer->vk);
VkResult init_result =
vk_command_buffer_init(&cmd_buffer->vk, &pool->vk, pAllocateInfo->level);
vk_command_buffer_init(&pool->vk, &cmd_buffer->vk, pAllocateInfo->level);
if (init_result != VK_SUCCESS)
result = init_result;

2
src/broadcom/vulkan/v3dv_cmd_buffer.c
View file

@ -91,7 +91,7 @@ cmd_buffer_create(struct v3dv_device *device,
return vk_error(device, VK_ERROR_OUT_OF_HOST_MEMORY);
VkResult result;
result = vk_command_buffer_init(&cmd_buffer->vk, pool, level);
result = vk_command_buffer_init(pool, &cmd_buffer->vk, level);
if (result != VK_SUCCESS) {
vk_free(&pool->alloc, cmd_buffer);
return result;

4
src/freedreno/vulkan/tu_cmd_buffer.c
View file

@ -1588,7 +1588,7 @@ tu_create_cmd_buffer(struct tu_device *device,
if (cmd_buffer == NULL)
return vk_error(device, VK_ERROR_OUT_OF_HOST_MEMORY);
VkResult result = vk_command_buffer_init(&cmd_buffer->vk, &pool->vk, level);
VkResult result = vk_command_buffer_init(&pool->vk, &cmd_buffer->vk, level);
if (result != VK_SUCCESS) {
vk_free2(&device->vk.alloc, NULL, cmd_buffer);
return result;
@ -1713,7 +1713,7 @@ tu_AllocateCommandBuffers(VkDevice _device,
result = tu_reset_cmd_buffer(cmd_buffer);
vk_command_buffer_finish(&cmd_buffer->vk);
VkResult init_result =
vk_command_buffer_init(&cmd_buffer->vk, &pool->vk, pAllocateInfo->level);
vk_command_buffer_init(&pool->vk, &cmd_buffer->vk, pAllocateInfo->level);
if (init_result != VK_SUCCESS)
result = init_result;

4
src/gallium/frontends/lavapipe/lvp_cmd_buffer.c
View file

@ -38,7 +38,7 @@ static VkResult lvp_create_cmd_buffer(
if (cmd_buffer == NULL)
return vk_error(device, VK_ERROR_OUT_OF_HOST_MEMORY);
VkResult result = vk_command_buffer_init(&cmd_buffer->vk, &pool->vk, level);
VkResult result = vk_command_buffer_init(&pool->vk, &cmd_buffer->vk, level);
if (result != VK_SUCCESS) {
vk_free(&pool->vk.alloc, cmd_buffer);
return result;
@ -91,7 +91,7 @@ VKAPI_ATTR VkResult VKAPI_CALL lvp_AllocateCommandBuffers(
result = lvp_reset_cmd_buffer(cmd_buffer);
vk_command_buffer_finish(&cmd_buffer->vk);
VkResult init_result =
vk_command_buffer_init(&cmd_buffer->vk, &pool->vk,
vk_command_buffer_init(&pool->vk, &cmd_buffer->vk,
pAllocateInfo->level);
if (init_result != VK_SUCCESS)
result = init_result;

2
src/imagination/vulkan/pvr_cmd_buffer.c
View file

@ -185,7 +185,7 @@ static VkResult pvr_cmd_buffer_create(struct pvr_device *device,
if (!cmd_buffer)
return vk_error(device, VK_ERROR_OUT_OF_HOST_MEMORY);
result = vk_command_buffer_init(&cmd_buffer->vk, pool, level);
result = vk_command_buffer_init(pool, &cmd_buffer->vk, level);
if (result != VK_SUCCESS) {
vk_free(&pool->alloc, cmd_buffer);
return result;

2
src/intel/vulkan/anv_cmd_buffer.c
View file

@ -98,7 +98,7 @@ static VkResult anv_create_cmd_buffer(
if (cmd_buffer == NULL)
return vk_error(pool, VK_ERROR_OUT_OF_HOST_MEMORY);
result = vk_command_buffer_init(&cmd_buffer->vk, pool, level);
result = vk_command_buffer_init(pool, &cmd_buffer->vk, level);
if (result != VK_SUCCESS)
goto fail_alloc;

2
src/microsoft/vulkan/dzn_cmd_buffer.c
View file

@ -355,7 +355,7 @@ dzn_cmd_buffer_create(const VkCommandBufferAllocateInfo *info,
return vk_error(pool->base.device, VK_ERROR_OUT_OF_HOST_MEMORY);
VkResult result =
vk_command_buffer_init(&cmdbuf->vk, pool, info->level);
vk_command_buffer_init(pool, &cmdbuf->vk, info->level);
if (result != VK_SUCCESS) {
vk_free(&pool->alloc, cmdbuf);
return result;

4
src/panfrost/vulkan/panvk_vX_cmd_buffer.c
View file

@ -1125,7 +1125,7 @@ panvk_create_cmdbuf(struct panvk_device *device,
if (!cmdbuf)
return vk_error(device, VK_ERROR_OUT_OF_HOST_MEMORY);
VkResult result = vk_command_buffer_init(&cmdbuf->vk, &pool->vk, level);
VkResult result = vk_command_buffer_init(&pool->vk, &cmdbuf->vk, level);
if (result != VK_SUCCESS) {
vk_free(&device->vk.alloc, cmdbuf);
return result;
@ -1184,7 +1184,7 @@ panvk_per_arch(AllocateCommandBuffers)(VkDevice _device,
list_addtail(&cmdbuf->pool_link, &pool->active_cmd_buffers);
vk_command_buffer_finish(&cmdbuf->vk);
result = vk_command_buffer_init(&cmdbuf->vk, &pool->vk, pAllocateInfo->level);
result = vk_command_buffer_init(&pool->vk, &cmdbuf->vk, pAllocateInfo->level);
} else {
result = panvk_create_cmdbuf(device, pool, pAllocateInfo->level, &cmdbuf);
}

4
src/vulkan/runtime/vk_command_buffer.c
View file

@ -28,8 +28,8 @@
#include "vk_device.h"
VkResult
vk_command_buffer_init(struct vk_command_buffer *command_buffer,
struct vk_command_pool *pool,
vk_command_buffer_init(struct vk_command_pool *pool,
struct vk_command_buffer *command_buffer,
VkCommandBufferLevel level)
{
memset(command_buffer, 0, sizeof(*command_buffer));

4
src/vulkan/runtime/vk_command_buffer.h
View file

@ -141,8 +141,8 @@ VK_DEFINE_HANDLE_CASTS(vk_command_buffer, base, VkCommandBuffer,
VK_OBJECT_TYPE_COMMAND_BUFFER)
VkResult MUST_CHECK
vk_command_buffer_init(struct vk_command_buffer *command_buffer,
struct vk_command_pool *pool,
vk_command_buffer_init(struct vk_command_pool *pool,
struct vk_command_buffer *command_buffer,
VkCommandBufferLevel level);
void