From a94a73bb3d3abb7a74233100b3725e6594bbb91b Mon Sep 17 00:00:00 2001 From: Luigi Santivetti Date: Thu, 22 Feb 2024 19:10:37 +0000 Subject: [PATCH] pvr: rename job field holding pds PR background objects Make the naming consistent with the pbe partial render field and with the pds pixel event partial render field. Signed-off-by: Luigi Santivetti Acked-by: Erik Faye-Lund Part-of: --- src/imagination/vulkan/pvr_cmd_buffer.c | 4 ++-- src/imagination/vulkan/pvr_job_render.c | 8 ++++---- src/imagination/vulkan/pvr_job_render.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/imagination/vulkan/pvr_cmd_buffer.c b/src/imagination/vulkan/pvr_cmd_buffer.c index 65a3ccb0bb1..cbc093eba02 100644 --- a/src/imagination/vulkan/pvr_cmd_buffer.c +++ b/src/imagination/vulkan/pvr_cmd_buffer.c @@ -1553,9 +1553,9 @@ static VkResult pvr_sub_cmd_gfx_job_init(const struct pvr_device_info *dev_info, spm_bgobj_state->pds_reg_values, ARRAY_SIZE(spm_bgobj_state->pds_reg_values)); - STATIC_ASSERT(ARRAY_SIZE(job->pds_pr_bgnd_reg_values) == + STATIC_ASSERT(ARRAY_SIZE(job->pr_pds_bgnd_reg_values) == ARRAY_SIZE(spm_bgobj_state->pds_reg_values)); - typed_memcpy(job->pds_pr_bgnd_reg_values, + typed_memcpy(job->pr_pds_bgnd_reg_values, spm_bgobj_state->pds_reg_values, ARRAY_SIZE(spm_bgobj_state->pds_reg_values)); } else if (hw_render->load_op) { diff --git a/src/imagination/vulkan/pvr_job_render.c b/src/imagination/vulkan/pvr_job_render.c index cb2fb62eb81..64213c941b8 100644 --- a/src/imagination/vulkan/pvr_job_render.c +++ b/src/imagination/vulkan/pvr_job_render.c @@ -1275,12 +1275,12 @@ static void pvr_frag_state_stream_init(struct pvr_render_ctx *ctx, sizeof(job->pds_bgnd_reg_values)); stream_ptr += ROGUE_NUM_CR_PDS_BGRND_WORDS * DWORDS_PER_U64; - STATIC_ASSERT(ARRAY_SIZE(job->pds_pr_bgnd_reg_values) == + STATIC_ASSERT(ARRAY_SIZE(job->pr_pds_bgnd_reg_values) == ROGUE_NUM_CR_PDS_BGRND_WORDS); - STATIC_ASSERT(sizeof(job->pds_pr_bgnd_reg_values[0]) == sizeof(uint64_t)); + STATIC_ASSERT(sizeof(job->pr_pds_bgnd_reg_values[0]) == sizeof(uint64_t)); memcpy(stream_ptr, - job->pds_pr_bgnd_reg_values, - sizeof(job->pds_pr_bgnd_reg_values)); + job->pr_pds_bgnd_reg_values, + sizeof(job->pr_pds_bgnd_reg_values)); stream_ptr += ROGUE_NUM_CR_PDS_BGRND_WORDS * DWORDS_PER_U64; #undef DWORDS_PER_U64 diff --git a/src/imagination/vulkan/pvr_job_render.h b/src/imagination/vulkan/pvr_job_render.h index 51a94d7fcfb..3f3d9e367bf 100644 --- a/src/imagination/vulkan/pvr_job_render.h +++ b/src/imagination/vulkan/pvr_job_render.h @@ -162,7 +162,7 @@ struct pvr_render_job { static_assert(ROGUE_NUM_CR_PDS_BGRND_WORDS == 3, "Cannot store all CR_PDS_BGRND words"); uint64_t pds_bgnd_reg_values[ROGUE_NUM_CR_PDS_BGRND_WORDS]; - uint64_t pds_pr_bgnd_reg_values[ROGUE_NUM_CR_PDS_BGRND_WORDS]; + uint64_t pr_pds_bgnd_reg_values[ROGUE_NUM_CR_PDS_BGRND_WORDS]; }; void pvr_rt_mtile_info_init(const struct pvr_device_info *dev_info,