From bc4012d7ed485dd93a76ca81bcae54c214f6efa6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timur=20Krist=C3=B3f?= Date: Wed, 13 Jul 2022 23:54:18 +0200 Subject: [PATCH] radv: Minor cleanup of radv_queue_submit_normal. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Move the uses_perf_counters ternary expression out of the loop into a variable called cs_offset. - Constify cmd_buffer_count. Signed-off-by: Timur Kristóf Reviewed-by: Bas Nieuwenhuizen Reviewed-by: Samuel Pitoiset Part-of: --- src/amd/vulkan/radv_device.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c index b5ebad24e9d..656a03df015 100644 --- a/src/amd/vulkan/radv_device.c +++ b/src/amd/vulkan/radv_device.c @@ -4966,7 +4966,6 @@ radv_queue_submit_normal(struct radv_queue *queue, struct vk_queue_submit *submi uint32_t advance; VkResult result; bool uses_perf_counters = false; - unsigned cmd_buffer_count = submission->command_buffer_count; result = radv_update_preambles(&queue->state, queue->device, submission->command_buffers, submission->command_buffer_count, &uses_perf_counters); @@ -4976,8 +4975,9 @@ radv_queue_submit_normal(struct radv_queue *queue, struct vk_queue_submit *submi if (queue->device->trace_bo) simple_mtx_lock(&queue->device->trace_mtx); - if (uses_perf_counters) - cmd_buffer_count += 2; + const unsigned cs_offset = uses_perf_counters ? 1 : 0; + const unsigned cmd_buffer_count = + submission->command_buffer_count + (uses_perf_counters ? 2 : 0); struct radeon_cmdbuf **cs_array = malloc(sizeof(struct radeon_cmdbuf *) * cmd_buffer_count); if (!cs_array) @@ -4987,7 +4987,7 @@ radv_queue_submit_normal(struct radv_queue *queue, struct vk_queue_submit *submi struct radv_cmd_buffer *cmd_buffer = (struct radv_cmd_buffer *)submission->command_buffers[j]; assert(cmd_buffer->vk.level == VK_COMMAND_BUFFER_LEVEL_PRIMARY); - cs_array[j + (uses_perf_counters ? 1 : 0)] = cmd_buffer->cs; + cs_array[j + cs_offset] = cmd_buffer->cs; if ((cmd_buffer->usage_flags & VK_COMMAND_BUFFER_USAGE_SIMULTANEOUS_USE_BIT)) can_patch = false;