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

panvk: Use resolve shaders for color resolves

Browse source 
This massively improves the performance of the Sascha Willems
multisampling example:

 - With 2x MSAA: 590 -> 2605 (4.4x speedup)
 - With 4x MSAA: 347 -> 2570 (7.4x speedup)
 - With 8x MSAA: 188 FPS -> 2494 FPS (13.2x speedup)
 - With 16x MSAA: 96.7 FPS -> 2483 FPS (25.7x speedup)

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-12 17:18:20 -05:00 • committed by Marge Bot
parent 0d78b72f91
commit b8de34da2b
4 changed files with 39 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/panfrost/vulkan/csf/panvk_vX_cmd_draw.c
View file

@ -1308,7 +1308,8 @@ get_fb_descs(struct panvk_cmd_buffer *cmdbuf)
};
VkResult result = panvk_per_arch(cmd_get_frame_shaders)(
cmdbuf, fbd_info.fb, fbd_info.load, NULL, &fbd_info.frame_shaders);
cmdbuf, fbd_info.fb, fbd_info.load, &render->fb.resolve,
&fbd_info.frame_shaders);
if (result != VK_SUCCESS)
return result;
@ -1348,7 +1349,9 @@ get_fb_descs(struct panvk_cmd_buffer *cmdbuf)
&render->fb.store : &render->fb.spill.store;
VkResult result = panvk_per_arch(cmd_get_frame_shaders)(
cmdbuf, fbd_info.fb, fbd_info.load, NULL, &fbd_info.frame_shaders);
cmdbuf, fbd_info.fb, fbd_info.load,
ir_pass == PANVK_IR_LAST_PASS ? &render->fb.resolve : NULL,
&fbd_info.frame_shaders);
if (result != VK_SUCCESS)
return result;

3
src/panfrost/vulkan/jm/panvk_vX_cmd_buffer.c
View file

@ -155,7 +155,8 @@ panvk_per_arch(cmd_close_batch)(struct panvk_cmd_buffer *cmdbuf)
struct pan_fb_frame_shaders fs;
VkResult result = panvk_per_arch(cmd_get_frame_shaders)(
cmdbuf, &render->fb.layout, fbd_info.load, NULL, &fs);
cmdbuf, &render->fb.layout, fbd_info.load,
render->fb.needs_store ? &render->fb.resolve : NULL, &fs);
if (result != VK_SUCCESS)
return;

1
src/panfrost/vulkan/panvk_cmd_draw.h
View file

@ -72,6 +72,7 @@ struct panvk_rendering_state {
struct {
struct pan_fb_layout layout;
struct pan_fb_load load;
struct pan_fb_resolve resolve;
struct pan_fb_store store;
struct {
struct pan_fb_load load;

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

@ -45,6 +45,18 @@ get_att_fb_load_op(const VkRenderingAttachmentInfo *att)
}
}
static enum pan_fb_msaa_copy_op
vk_to_pan_fb_resolve_mode(VkResolveModeFlagBits resolveMode)
{
switch (resolveMode) {
case VK_RESOLVE_MODE_SAMPLE_ZERO_BIT: return PAN_FB_MSAA_COPY_SAMPLE_0;
case VK_RESOLVE_MODE_AVERAGE_BIT: return PAN_FB_MSAA_COPY_AVERAGE;
case VK_RESOLVE_MODE_MIN_BIT: return PAN_FB_MSAA_COPY_MIN;
case VK_RESOLVE_MODE_MAX_BIT: return PAN_FB_MSAA_COPY_MAX;
default: UNREACHABLE("Unsupported resolveMode");
}
}
static struct panvk_image_view *
get_ms2ss_image_view(struct panvk_image_view *iview, uint32_t nr_samples)
{
@ -163,9 +175,25 @@ render_state_set_color_attachment(struct panvk_cmd_buffer *cmdbuf,
assert(resolve.dst_iview != NULL);
assert(resolve.dst_iview->pview.nr_samples == 1);
/* We need to store so we can do the MSAA resolve later */
render->fb.store.rts[index] = pan_fb_store_iview(&iview->pview);
render->color_attachments.resolve[index] = resolve;
if (ms2ss || att->storeOp != VK_ATTACHMENT_STORE_OP_STORE) {
render->fb.resolve.rts[index] = (struct pan_fb_resolve_target) {
.in_bounds = {
.resolve = PAN_FB_RESOLVE_RT(index),
.msaa = vk_to_pan_fb_resolve_mode(att->resolveMode),
},
.border = {
.resolve = PAN_FB_RESOLVE_IMAGE,
.msaa = PAN_FB_MSAA_COPY_SINGLE,
},
.iview = &resolve.dst_iview->pview,
};
render->fb.store.rts[index] =
pan_fb_always_store_iview_s0(&resolve.dst_iview->pview);
} else {
/* We need to store so we can do the MSAA resolve later */
render->fb.store.rts[index] = pan_fb_store_iview(&iview->pview);
render->color_attachments.resolve[index] = resolve;
}
}
}