From 8cc474cd87b90af737f0647a2a63561b6528fbc5 Mon Sep 17 00:00:00 2001 From: Matt Coster Date: Tue, 17 Jan 2023 13:48:11 +0000 Subject: [PATCH] pvr: Rename global_queue_job_count to global_cmd_buffer_submit_count This makes the name more accurate, since submits which require multiple job submissions behind the scenes do not additionally increment this counter. Signed-off-by: Matt Coster Reviewed-by: Karmjit Mahil Part-of: --- src/imagination/vulkan/pvr_device.c | 2 +- src/imagination/vulkan/pvr_job_compute.c | 2 +- src/imagination/vulkan/pvr_job_render.c | 2 +- src/imagination/vulkan/pvr_private.h | 2 +- src/imagination/vulkan/pvr_queue.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/imagination/vulkan/pvr_device.c b/src/imagination/vulkan/pvr_device.c index 0660842aacb..d7bb421ecb8 100644 --- a/src/imagination/vulkan/pvr_device.c +++ b/src/imagination/vulkan/pvr_device.c @@ -1790,7 +1790,7 @@ VkResult pvr_CreateDevice(VkPhysicalDevice physicalDevice, &pdevice->dev_info, &device->pixel_event_data_size_in_dwords); - device->global_queue_job_count = 0; + device->global_cmd_buffer_submit_count = 0; device->global_queue_present_count = 0; *pDevice = pvr_device_to_handle(device); diff --git a/src/imagination/vulkan/pvr_job_compute.c b/src/imagination/vulkan/pvr_job_compute.c index 4af9f21a75a..ef8d2275125 100644 --- a/src/imagination/vulkan/pvr_job_compute.c +++ b/src/imagination/vulkan/pvr_job_compute.c @@ -191,7 +191,7 @@ static void pvr_compute_job_ws_submit_info_init( memset(submit_info, 0, sizeof(*submit_info)); submit_info->frame_num = device->global_queue_present_count; - submit_info->job_num = device->global_queue_job_count; + submit_info->job_num = device->global_cmd_buffer_submit_count; submit_info->barrier = barrier; diff --git a/src/imagination/vulkan/pvr_job_render.c b/src/imagination/vulkan/pvr_job_render.c index ffc05dfed7f..b772ef0dddd 100644 --- a/src/imagination/vulkan/pvr_job_render.c +++ b/src/imagination/vulkan/pvr_job_render.c @@ -1707,7 +1707,7 @@ static void pvr_render_job_ws_submit_info_init( submit_info->rt_data_idx = job->rt_dataset->rt_data_idx; submit_info->frame_num = ctx->device->global_queue_present_count; - submit_info->job_num = ctx->device->global_queue_job_count; + submit_info->job_num = ctx->device->global_cmd_buffer_submit_count; submit_info->barrier_geom = barrier_geom; diff --git a/src/imagination/vulkan/pvr_private.h b/src/imagination/vulkan/pvr_private.h index fe4df7a19a0..05fc2c0f1ad 100644 --- a/src/imagination/vulkan/pvr_private.h +++ b/src/imagination/vulkan/pvr_private.h @@ -298,7 +298,7 @@ struct pvr_device { uint32_t queue_count; /* Running count of the number of job submissions across all queue. */ - uint32_t global_queue_job_count; + uint32_t global_cmd_buffer_submit_count; /* Running count of the number of presentations across all queues. */ uint32_t global_queue_present_count; diff --git a/src/imagination/vulkan/pvr_queue.c b/src/imagination/vulkan/pvr_queue.c index 70b35359e14..9546402b295 100644 --- a/src/imagination/vulkan/pvr_queue.c +++ b/src/imagination/vulkan/pvr_queue.c @@ -865,7 +865,7 @@ static VkResult pvr_process_cmd_buffer( if (result != VK_SUCCESS) return result; - p_atomic_inc(&device->global_queue_job_count); + p_atomic_inc(&device->global_cmd_buffer_submit_count); } pvr_update_syncobjs(device, per_cmd_buffer_syncobjs, per_submit_syncobjs);