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

zink: fix UIL feedback loop usage

Browse source 
I got this confused with the DRLR type of feedback loop

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36029>
This commit is contained in:
Mike Blumenkrantz 2025-07-09 13:06:19 -04:00 • committed by Marge Bot
parent 1b0c377923
commit 69afd8678a
2 changed files with 21 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2925,9 +2925,6 @@ begin_rendering(struct zink_context *ctx, bool check_msaa_expand)
bool has_msrtss = screen->info.have_EXT_multisampled_render_to_single_sampled;
bool use_tc_info = !ctx->blitting && ctx->track_renderpasses;
uint32_t msaa_expand_mask = 0;
/* 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;
@ -3082,14 +3079,6 @@ begin_rendering(struct zink_context *ctx, bool check_msaa_expand)
assert(!ctx->dynamic_fb.info.pStencilAttachment || ctx->gfx_pipeline_state.rendering_info.stencilAttachmentFormat);
bool rp_changed = ctx->gfx_pipeline_state.rp_state != rp_state;
if (screen->info.have_KHR_unified_image_layouts && screen->info.have_EXT_attachment_feedback_loop_layout) {
rp_changed |= had_fbfetch_info != !!ctx->fbfetch_outputs;
if (ctx->fbfetch_outputs) {
assert(ctx->fbfetch_outputs == BITFIELD_BIT(0));
ctx->dynamic_fb.attachments[0].pNext = &ctx->dynamic_fb.fbfetch_att;
}
}
if (!rp_changed && ctx->in_rp)
return 0;
@ -3685,6 +3674,11 @@ unbind_fb_surface(struct zink_context *ctx, const struct pipe_surface *surf, uns
ctx->gfx_pipeline_state.dirty = true;
ctx->gfx_pipeline_state.feedback_loop = false;
}
if (zink_screen(ctx->base.screen)->info.have_KHR_unified_image_layouts && zink_screen(ctx->base.screen)->info.have_EXT_attachment_feedback_loop_layout) {
ctx->dynamic_fb.fbfetch_att[idx].feedbackLoopEnable = VK_FALSE;
if (idx == PIPE_MAX_COLOR_BUFS)
ctx->dynamic_fb.fbfetch_att[idx + 1].feedbackLoopEnable = VK_FALSE;
}
}
res->fb_binds &= ~BITFIELD_BIT(idx);
batch_ref_fb_surface(ctx, surf);
@ -5468,12 +5462,17 @@ zink_context_create(struct pipe_screen *pscreen, void *priv, unsigned flags)
att->imageLayout = general_layout ? VK_IMAGE_LAYOUT_GENERAL : VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
att->resolveImageLayout = general_layout ? VK_IMAGE_LAYOUT_GENERAL : VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
att->storeOp = VK_ATTACHMENT_STORE_OP_STORE;
if (screen->info.have_KHR_unified_image_layouts && screen->info.have_EXT_attachment_feedback_loop_layout)
att->pNext = &ctx->dynamic_fb.fbfetch_att[i];
}
ctx->dynamic_fb.fbfetch_att = (VkAttachmentFeedbackLoopInfoEXT){
VK_STRUCTURE_TYPE_ATTACHMENT_FEEDBACK_LOOP_INFO_EXT,
NULL,
VK_TRUE
};
for (unsigned i = 0; i < ARRAY_SIZE(ctx->dynamic_fb.fbfetch_att); i++) {
ctx->dynamic_fb.fbfetch_att[i] = (VkAttachmentFeedbackLoopInfoEXT){
VK_STRUCTURE_TYPE_ATTACHMENT_FEEDBACK_LOOP_INFO_EXT,
NULL,
VK_FALSE
};
}
ctx->gfx_pipeline_state.rendering_info.sType = VK_STRUCTURE_TYPE_PIPELINE_RENDERING_CREATE_INFO;
ctx->gfx_pipeline_state.rendering_info.pColorAttachmentFormats = ctx->gfx_pipeline_state.rendering_formats;
ctx->gfx_pipeline_state.feedback_loop = screen->driver_workarounds.always_feedback_loop;
@ -5749,7 +5748,11 @@ add_implicit_feedback_loop(struct zink_context *ctx, struct zink_resource *res)
}
ctx->rp_layout_changed = true;
ctx->feedback_loops |= is_feedback;
if (!zink_screen(ctx->base.screen)->driver_workarounds.general_layout) {
if (zink_screen(ctx->base.screen)->info.have_KHR_unified_image_layouts && zink_screen(ctx->base.screen)->info.have_EXT_attachment_feedback_loop_layout) {
u_foreach_bit(idx, is_feedback) {
ctx->dynamic_fb.fbfetch_att[idx].feedbackLoopEnable = VK_TRUE;
}
} else {
u_foreach_bit(idx, is_feedback) {
if (zink_screen(ctx->base.screen)->info.have_EXT_attachment_feedback_loop_layout)
ctx->dynamic_fb.attachments[idx].imageLayout = VK_IMAGE_LAYOUT_ATTACHMENT_FEEDBACK_LOOP_OPTIMAL_EXT;

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

@ -1766,7 +1766,7 @@ struct zink_context {
VkRenderingAttachmentInfo attachments[PIPE_MAX_COLOR_BUFS + 2]; //+depth, +stencil
VkRenderingInfo info;
struct tc_renderpass_info tc_info;
VkAttachmentFeedbackLoopInfoEXT fbfetch_att;
VkAttachmentFeedbackLoopInfoEXT fbfetch_att[PIPE_MAX_COLOR_BUFS + 2]; //+depth, +stencil
} dynamic_fb;
uint32_t fb_layer_mismatch; //bitmask
struct set rendering_state_cache[6]; //[util_logbase2_ceil(msrtss samplecount)]