fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 09:18:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

pvr: Rename pvr_render_input_attachment

Browse source 
The struct will also be used for preserve attachments in the next
commit.

Backport-to: 26.0

Signed-off-by: Nick Hamilton <nick.hamilton@imgtec.com>
Reviewed-by: Frank Binns <frank.binns@imgtec.com>
(cherry picked from commit e18670347a)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/40092>
This commit is contained in:
Nick Hamilton 2026-02-20 16:34:11 +00:00 • committed by Eric Engestrom
parent fb1ba13c57
commit a965c71ec6
5 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -514,7 +514,7 @@
"description": "pvr: Rename pvr_render_input_attachment",
"nominated": true,
"nomination_type": 4,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": null,
"notes": null

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

@ -9333,7 +9333,7 @@ pvr_stencil_has_self_dependency(const struct pvr_cmd_buffer_state *const state)
{
const struct pvr_render_subpass *const current_subpass =
pvr_get_current_subpass(state);
const struct pvr_render_input_attachment *const input_attachments =
const struct pvr_render_attachment *const input_attachments =
current_subpass->input_attachments;
if (current_subpass->depth_stencil_attachment == VK_ATTACHMENT_UNUSED)

13
src/imagination/vulkan/pvr_arch_hw_pass.c
View file

@ -2247,7 +2247,7 @@ pvr_dereference_color_output_list(struct pvr_renderpass_context *ctx,
static void
pvr_dereference_surface_list(struct pvr_renderpass_context *ctx,
uint32_t subpass_num,
struct pvr_render_input_attachment *attachments,
struct pvr_render_attachment *attachments,
uint32_t count)
{
for (uint32_t i = 0U; i < count; i++) {
@ -2399,8 +2399,8 @@ static VkResult pvr_schedule_subpass(const struct pvr_device *device,
return VK_SUCCESS;
}
static uint32_t pvr_count_uses_in_input_attachment_list(
struct pvr_render_input_attachment *attachments,
static uint32_t pvr_count_uses_in_attachment_list(
struct pvr_render_attachment *attachments,
uint32_t size,
uint32_t attach_idx)
{
@ -2591,9 +2591,10 @@ VkResult pvr_arch_create_renderpass_hwsetup(
for (uint32_t j = 0U; j < pass->subpass_count; j++) {
struct pvr_render_subpass *subpass = &pass->subpasses[j];
const uint32_t input_attachment_uses =
pvr_count_uses_in_input_attachment_list(subpass->input_attachments,
subpass->input_count,
i);
pvr_count_uses_in_attachment_list(subpass->input_attachments,
subpass->input_count,
i);
uint32_t resolve_output_uses;
uint32_t color_output_uses;
uint32_t total_output_uses;

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

@ -763,7 +763,7 @@ PVR_PER_ARCH(CreateRenderPass2)(VkDevice _device,
const VkAllocationCallbacks *alloc;
size_t subpass_attachment_count;
size_t subpass_input_attachment_count;
struct pvr_render_input_attachment *subpass_input_attachments;
struct pvr_render_attachment *subpass_input_attachments;
uint32_t *subpass_attachments;
struct pvr_render_pass *pass;
uint32_t *dep_list;

4
src/imagination/vulkan/pvr_pass.h
View file

@ -51,7 +51,7 @@ struct pvr_render_pass_attachment {
uint32_t index;
};
struct pvr_render_input_attachment {
struct pvr_render_attachment {
uint32_t attachment_idx;
VkImageAspectFlags aspect_mask;
};
@ -69,7 +69,7 @@ struct pvr_render_subpass {
uint32_t *resolve_attachments;
uint32_t input_count;
struct pvr_render_input_attachment *input_attachments;
struct pvr_render_attachment *input_attachments;
uint32_t depth_stencil_attachment;