fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-31 22:50:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

zink: add ZINK_DEBUG to skip msaa stores on renderpasses which have ended
Some checks are pending
macOS-CI / macOS-CI (dri) (push) Waiting to run
Details
macOS-CI / macOS-CI (xlib) (push) Waiting to run
Details

Browse source 
this is super illegal and not conformant but very desirable on tilers
for certain apps

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35477>
This commit is contained in:
Mike Blumenkrantz 2025-06-11 14:48:44 -04:00
parent 2b6e7c4609
commit 5bc840ea62
4 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/drivers/zink.rst
View file

@ -321,6 +321,8 @@ variable:
Suppress probably-harmless warnings
``nopc``
No precompilation
``msaaopt``
Optimize out loads/stores of MSAA attachments (nonconformant)
Vulkan Validation Layers
^^^^^^^^^^^^^^^^^^^^^^^^

11
src/gallium/drivers/zink/zink_context.c
View file

@ -2970,6 +2970,8 @@ begin_rendering(struct zink_context *ctx, bool check_msaa_expand)
/* TODO: if multiple fbfetch attachments or zsbuf fbfetch */
bool had_fbfetch_info = !!ctx->dynamic_fb.attachments[0].pNext;
/* j/k this is super nonconformant */
bool very_legal_and_conformant_msaa_opt = ctx->dynamic_fb.tc_info.has_resolve && ctx->dynamic_fb.tc_info.ended && (zink_debug & ZINK_DEBUG_MSAAOPT);
ctx->dynamic_fb.attachments[0].pNext = NULL;
if (ctx->rp_changed || ctx->rp_layout_changed || (!ctx->in_rp && ctx->rp_loadop_changed)) {
/* init imageviews, base loadOp, formats */
@ -2978,13 +2980,12 @@ begin_rendering(struct zink_context *ctx, bool check_msaa_expand)
if (!surf)
continue;
if (!zink_resource(surf->base.texture)->valid)
if (!zink_resource(surf->base.texture)->valid || very_legal_and_conformant_msaa_opt)
ctx->dynamic_fb.attachments[i].loadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE;
else
ctx->dynamic_fb.attachments[i].loadOp = VK_ATTACHMENT_LOAD_OP_LOAD;
if (use_tc_info) {
/* can't skip stores if this is not a winsys resolve */
if ((!ctx->dynamic_fb.tc_info.has_resolve || ctx->fb_state.resolve) && ctx->dynamic_fb.tc_info.cbuf_invalidate & BITFIELD_BIT(i))
if (very_legal_and_conformant_msaa_opt || ctx->dynamic_fb.tc_info.cbuf_invalidate & BITFIELD_BIT(i))
ctx->dynamic_fb.attachments[i].storeOp = VK_ATTACHMENT_STORE_OP_DONT_CARE;
else
ctx->dynamic_fb.attachments[i].storeOp = VK_ATTACHMENT_STORE_OP_STORE;
@ -3005,13 +3006,13 @@ begin_rendering(struct zink_context *ctx, bool check_msaa_expand)
has_stencil = util_format_has_stencil(util_format_description(ctx->fb_state.zsbuf.format));
/* depth may or may not be used but init it anyway */
if (zink_resource(surf->base.texture)->valid)
if (zink_resource(surf->base.texture)->valid && !very_legal_and_conformant_msaa_opt)
ctx->dynamic_fb.attachments[PIPE_MAX_COLOR_BUFS].loadOp = VK_ATTACHMENT_LOAD_OP_LOAD;
else
ctx->dynamic_fb.attachments[PIPE_MAX_COLOR_BUFS].loadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE;
if (use_tc_info) {
if (ctx->dynamic_fb.tc_info.zsbuf_invalidate)
if ((very_legal_and_conformant_msaa_opt && !ctx->fb_state.nr_cbufs) || ctx->dynamic_fb.tc_info.zsbuf_invalidate)
ctx->dynamic_fb.attachments[PIPE_MAX_COLOR_BUFS].storeOp = VK_ATTACHMENT_STORE_OP_DONT_CARE;
else
ctx->dynamic_fb.attachments[PIPE_MAX_COLOR_BUFS].storeOp = VK_ATTACHMENT_STORE_OP_STORE;

1
src/gallium/drivers/zink/zink_screen.c
View file

@ -117,6 +117,7 @@ zink_debug_options[] = {
{ "quiet", ZINK_DEBUG_QUIET, "Suppress warnings" },
{ "ioopt", ZINK_DEBUG_IOOPT, "Optimize IO" },
{ "nopc", ZINK_DEBUG_NOPC, "No precompilation" },
{ "msaaopt", ZINK_DEBUG_MSAAOPT, "Optimize out loads/stores of MSAA attachments" },
DEBUG_NAMED_VALUE_END
};

1
src/gallium/drivers/zink/zink_types.h
View file

@ -243,6 +243,7 @@ enum zink_debug {
ZINK_DEBUG_QUIET = (1<<18),
ZINK_DEBUG_IOOPT = (1<<19),
ZINK_DEBUG_NOPC = (1<<20),
ZINK_DEBUG_MSAAOPT = (1<<21),
};
enum zink_pv_emulation_primitive {