fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-06 15:58:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

tu: Fix setting will_be_resolved with MSRTSS

Browse source 
We were setting it on the user's attachments, which become
resolve/unresolve attachments, but it should be set on the color
and depth/stencil attachments.

Cc: mesa-stable
(cherry picked from commit d0be4ab2ab)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/40359>
This commit is contained in:
Connor Abbott 2026-02-06 18:31:45 -05:00 • committed by Eric Engestrom
parent 9a361c3801
commit 725626858d
2 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -1914,7 +1914,7 @@
"description": "tu: Fix setting will_be_resolved with MSRTSS",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": null,
"notes": null

21
src/freedreno/vulkan/tu_pass.cc
View file

@ -1485,13 +1485,11 @@ tu_setup_dynamic_render_pass(struct tu_cmd_buffer *cmd_buffer,
subpass->unresolve_attachments[i].attachment = att_idx;
else
subpass->unresolve_attachments[i].attachment = VK_ATTACHMENT_UNUSED;
if (att_info->storeOp == VK_ATTACHMENT_STORE_OP_STORE) {
if (att_info->storeOp == VK_ATTACHMENT_STORE_OP_STORE)
subpass->resolve_attachments[i].attachment = att_idx;
att->will_be_resolved = true;
} else {
else
subpass->resolve_attachments[i].attachment = VK_ATTACHMENT_UNUSED;
att->will_be_resolved = false;
}
att->will_be_resolved = false;
attachment_set_ops(device, att, VK_ATTACHMENT_LOAD_OP_DONT_CARE,
VK_ATTACHMENT_LOAD_OP_DONT_CARE,
att_info->storeOp,
@ -1594,15 +1592,13 @@ tu_setup_dynamic_render_pass(struct tu_cmd_buffer *cmd_buffer,
if (store) {
unsigned i = subpass->resolve_count++;
subpass->resolve_attachments[i].attachment = att_idx;
att->will_be_resolved = true;
subpass->resolve_depth_stencil = true;
} else {
att->will_be_resolved = false;
}
attachment_set_ops(device, att, VK_ATTACHMENT_LOAD_OP_DONT_CARE,
VK_ATTACHMENT_LOAD_OP_DONT_CARE,
store_op, stencil_store_op);
att_is_msrtss = true;
att->will_be_resolved = false;
subpass->samples = msrtss->rasterizationSamples;
} else {
att->gmem = true;
@ -1736,6 +1732,8 @@ tu_setup_dynamic_render_pass(struct tu_cmd_buffer *cmd_buffer,
VK_ATTACHMENT_STORE_OP_DONT_CARE,
VK_ATTACHMENT_STORE_OP_DONT_CARE);
subpass->color_attachments[i].attachment = att_idx;
att->will_be_resolved =
att_info->storeOp == VK_ATTACHMENT_STORE_OP_STORE;
}
}
@ -1769,6 +1767,13 @@ tu_setup_dynamic_render_pass(struct tu_cmd_buffer *cmd_buffer,
att->used_views = info->viewMask;
att->user_att = subpass->depth_stencil_attachment.attachment;
subpass->depth_stencil_attachment.attachment = att_idx;
att->will_be_resolved =
(info->pDepthAttachment &&
info->pDepthAttachment->imageView &&
info->pDepthAttachment->storeOp == VK_ATTACHMENT_STORE_OP_STORE) ||
(info->pStencilAttachment &&
info->pStencilAttachment->imageView &&
info->pStencilAttachment->storeOp == VK_ATTACHMENT_STORE_OP_STORE);
}
}
}