zink: unset rp_changed after initializing renderpass attachments
authorMike Blumenkrantz <michael.blumenkrantz@gmail.com>
Thu, 13 Oct 2022 20:29:27 +0000 (16:29 -0400)
committerMarge Bot <emma+marge@anholt.net>
Fri, 14 Oct 2022 01:16:30 +0000 (01:16 +0000)
if fbfetch is setup here, it will flag rp_changed

this is already inside renderpass setup, however, so just unset it
to avoid erroneously trigering the assert

cc: mesa-stable

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19065>

src/gallium/drivers/zink/zink_render_pass.c

index eb4b61f..b1531a3 100644 (file)
@@ -628,6 +628,8 @@ begin_render_pass(struct zink_context *ctx)
    infos.pAttachments = att;
    if (!prep_fb_attachments(ctx, att))
       return 0;
+   /* this can be set if fbfetch is activated */
+   ctx->rp_changed = false;
 #ifndef NDEBUG
    const unsigned cresolve_offset = ctx->fb_state.nr_cbufs + !!ctx->fb_state.zsbuf;
    for (int i = 0; i < ctx->fb_state.nr_cbufs; i++) {