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

zink: re-allow transient images during blitting

Browse source 
now that transient images are a more complete mechanism, this should
in theory be okay and also accounts for the case where
a framebuffer contains mixed msrtt textures and plain multisampled textures

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/39464>
This commit is contained in:
Mike Blumenkrantz 2026-01-22 14:52:30 -05:00 • committed by Marge Bot
parent 457149a48e
commit 6474af3b42
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2986,7 +2986,7 @@ prep_fb_attachment(struct zink_context *ctx, struct zink_resource *res, unsigned
if (!i)
zink_update_fbfetch(ctx);
}
if (ctx->blitting) {
if (ctx->blitting && !(res->base.b.bind & ZINK_BIND_TRANSIENT)) {
zink_batch_resource_usage_set(ctx->bs, res, true, false);
return true;
}
@ -3082,7 +3082,7 @@ begin_rendering(struct zink_context *ctx, bool check_attachment_shadow)
else
ctx->dynamic_fb.attachments[i].storeOp = VK_ATTACHMENT_STORE_OP_STORE;
}
if (!ctx->blitting && ctx->dynamic_fb.attachments[i].loadOp == VK_ATTACHMENT_LOAD_OP_LOAD)
if (ctx->dynamic_fb.attachments[i].loadOp == VK_ATTACHMENT_LOAD_OP_LOAD)
attachment_shadow_mask |= BITFIELD_BIT(i);
pformats[i] = ctx->fb_state.cbufs[i].format;
}
@ -3258,7 +3258,7 @@ begin_rendering(struct zink_context *ctx, bool check_attachment_shadow)
/* swapchain acquire can change this surface */
iv = zink_create_fb_surface(&ctx->base, &templ)->image_view;
}
if (ctx->fb_state.cbufs[i].nr_samples && !has_msrtss && !ctx->blitting) {
if (ctx->fb_state.cbufs[i].nr_samples && !has_msrtss) {
ctx->dynamic_fb.attachments[i].resolveMode = VK_RESOLVE_MODE_AVERAGE_BIT;
ctx->dynamic_fb.attachments[i].resolveImageView = iv;
ctx->dynamic_fb.attachments[i].resolveImageLayout = res->layout;
@ -3303,7 +3303,7 @@ begin_rendering(struct zink_context *ctx, bool check_attachment_shadow)
struct zink_resource *res = zink_resource(ctx->fb_state.zsbuf.texture);
prep_fb_attachment(ctx, res, ctx->fb_state.nr_cbufs);
VkImageView iv = zink_create_fb_surface(&ctx->base, &ctx->fb_state.zsbuf)->image_view;
if (ctx->fb_state.zsbuf.nr_samples && !has_msrtss && !ctx->blitting) {
if (ctx->fb_state.zsbuf.nr_samples && !has_msrtss) {
ctx->dynamic_fb.attachments[PIPE_MAX_COLOR_BUFS].resolveImageView = iv;
ctx->dynamic_fb.attachments[PIPE_MAX_COLOR_BUFS].resolveImageLayout = res->layout;
ctx->dynamic_fb.attachments[PIPE_MAX_COLOR_BUFS+1].resolveImageView = iv;
@ -3322,7 +3322,7 @@ begin_rendering(struct zink_context *ctx, bool check_attachment_shadow)
ctx->dynamic_fb.attachments[PIPE_MAX_COLOR_BUFS+1].imageView = iv;
ctx->dynamic_fb.attachments[PIPE_MAX_COLOR_BUFS+1].imageLayout = res->layout;
assert(ctx->dynamic_fb.attachments[PIPE_MAX_COLOR_BUFS+1].imageLayout != VK_IMAGE_LAYOUT_UNDEFINED);
if (ctx->transient_attachments & BITFIELD_BIT(PIPE_MAX_COLOR_BUFS) && !ctx->blitting) {
if (ctx->transient_attachments & BITFIELD_BIT(PIPE_MAX_COLOR_BUFS)) {
ctx->dynamic_fb.attachments[PIPE_MAX_COLOR_BUFS].resolveMode = VK_RESOLVE_MODE_SAMPLE_ZERO_BIT;
ctx->dynamic_fb.attachments[PIPE_MAX_COLOR_BUFS + 1].resolveMode = VK_RESOLVE_MODE_SAMPLE_ZERO_BIT;
} else {
@ -3392,7 +3392,7 @@ begin_rendering(struct zink_context *ctx, bool check_attachment_shadow)
VK_TRUE,
ctx->gfx_pipeline_state.rast_samples + 1,
};
ctx->dynamic_fb.info.pNext = ctx->transient_msrtss && !ctx->blitting && has_msrtss ? &msrtss : NULL;
ctx->dynamic_fb.info.pNext = ctx->transient_msrtss && has_msrtss ? &msrtss : NULL;
VKCTX(CmdBeginRendering)(ctx->bs->cmdbuf, &ctx->dynamic_fb.info);
ctx->in_rp = true;

2
src/gallium/drivers/zink/zink_synchronization.cpp
View file

@ -165,7 +165,7 @@ ALWAYS_INLINE static void
resource_defer_image_barrier(struct zink_context *ctx, struct zink_resource *res, VkPipelineStageFlags pipeline)
{
assert(!res->obj->is_buffer);
assert(!ctx->blitting);
assert(!ctx->blitting || res->base.b.bind & ZINK_BIND_TRANSIENT);
bool is_compute = pipeline == VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT;
/* if this is a non-shader barrier and there are binds, always queue a shader barrier */