fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-03-17 19:00:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

panvk: Refactor resolveMode handling

Browse source 
Reviewed-by: Lars-Ivar Hesselberg Simonsen <lars-ivar.simonsen@arm.com>
Acked-by: Boris Brezillon <boris.brezillon@collabora.com>
Acked-by: Eric R. Smith <eric.smith@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/39759>
This commit is contained in:
Faith Ekstrand 2026-02-13 15:44:20 -05:00 • committed by Marge Bot
parent a59bf9c0f2
commit 7bf9e203f2
1 changed files with 26 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
src/panfrost/vulkan/panvk_vX_cmd_draw.c
View file

@ -144,8 +144,6 @@ render_state_set_color_attachment(struct panvk_cmd_buffer *cmdbuf,
&fbinfo->rts[index].preload);
if (att->resolveMode != VK_RESOLVE_MODE_NONE) {
struct panvk_resolve_attachment *resolve_info =
&render->color_attachments.resolve[index];
VK_FROM_HANDLE(panvk_image_view, resolve_iview, att->resolveImageView);
/* VUID-VkRenderingAttachmentInfo-imageView-06862 and
@ -154,14 +152,14 @@ render_state_set_color_attachment(struct panvk_cmd_buffer *cmdbuf,
* resolveView == NULL iff. multisampledRenderToSingleSampledEnable */
assert(ms2ss == (resolve_iview == NULL));
resolve_info->mode = att->resolveMode;
if (!ms2ss) {
resolve_info->dst_iview = resolve_iview;
} else {
assert(iview_ss);
resolve_info->dst_iview = iview_ss;
assert(resolve_info->dst_iview->pview.nr_samples == 1);
}
const struct panvk_resolve_attachment resolve = {
.dst_iview = ms2ss ? iview_ss : resolve_iview,
.mode = att->resolveMode,
};
assert(resolve.dst_iview != NULL);
assert(resolve.dst_iview->pview.nr_samples == 1);
render->color_attachments.resolve[index] = resolve;
}
}
@ -229,18 +227,17 @@ render_state_set_z_attachment(struct panvk_cmd_buffer *cmdbuf,
att_set_clear_preload(att, &fbinfo->zs.clear.z, &fbinfo->zs.preload.z);
if (att->resolveMode != VK_RESOLVE_MODE_NONE) {
struct panvk_resolve_attachment *resolve_info =
&render->z_attachment.resolve;
VK_FROM_HANDLE(panvk_image_view, resolve_iview, att->resolveImageView);
assert(ms2ss == (resolve_iview == NULL));
resolve_info->mode = att->resolveMode;
if (!ms2ss) {
resolve_info->dst_iview = resolve_iview;
} else {
assert(iview_ss);
resolve_info->dst_iview = iview_ss;
assert(resolve_info->dst_iview->pview.nr_samples == 1);
}
const struct panvk_resolve_attachment resolve = {
.dst_iview = ms2ss ? iview_ss : resolve_iview,
.mode = att->resolveMode,
};
assert(resolve.dst_iview != NULL);
assert(resolve.dst_iview->pview.nr_samples == 1);
render->z_attachment.resolve = resolve;
}
}
@ -328,18 +325,17 @@ render_state_set_s_attachment(struct panvk_cmd_buffer *cmdbuf,
att_set_clear_preload(att, &fbinfo->zs.clear.s, &fbinfo->zs.preload.s);
if (att->resolveMode != VK_RESOLVE_MODE_NONE) {
struct panvk_resolve_attachment *resolve_info =
&render->s_attachment.resolve;
VK_FROM_HANDLE(panvk_image_view, resolve_iview, att->resolveImageView);
assert(ms2ss == (resolve_iview == NULL));
resolve_info->mode = att->resolveMode;
if (!ms2ss) {
resolve_info->dst_iview = resolve_iview;
} else {
assert(iview_ss);
resolve_info->dst_iview = iview_ss;
assert(resolve_info->dst_iview->pview.nr_samples == 1);
}
const struct panvk_resolve_attachment resolve = {
.dst_iview = ms2ss ? iview_ss : resolve_iview,
.mode = att->resolveMode,
};
assert(resolve.dst_iview != NULL);
assert(resolve.dst_iview->pview.nr_samples == 1);
render->s_attachment.resolve = resolve;
}
}