zink: add flags for determining whether to update framebuffer and renderpass

we can optimize restarting renderpasses here a little by only performing
lookups if states have actually changed

Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10761>

diff --git a/src/gallium/drivers/zink/zink_context.c b/src/gallium/drivers/zink/zink_context.c
index b58b968..ae0f198 100644 (file)
--- a/src/gallium/drivers/zink/zink_context.c
+++ b/src/gallium/drivers/zink/zink_context.c
@@ -1355,11 +1355,25 @@ static void
 setup_framebuffer(struct zink_context *ctx)
 {
    struct zink_screen *screen = zink_screen(ctx->base.screen);
-   zink_init_framebuffer(screen, ctx->framebuffer, get_render_pass(ctx));
+   struct zink_render_pass *rp = ctx->gfx_pipeline_state.render_pass;
 
-   if (ctx->framebuffer->rp != ctx->gfx_pipeline_state.render_pass)
-      ctx->gfx_pipeline_state.dirty = true;
-   ctx->gfx_pipeline_state.render_pass = ctx->framebuffer->rp;
+   if (rp)
+      ctx->rp_changed |= ctx->rp_clears_enabled != rp->state.clears;
+   if (ctx->rp_changed)
+      rp = get_render_pass(ctx);
+
+   if (rp != ctx->gfx_pipeline_state.render_pass)
+      ctx->gfx_pipeline_state.dirty =
+      ctx->fb_changed = true;
+
+   ctx->rp_changed = false;
+
+   if (!ctx->fb_changed)
+      return;
+
+   zink_init_framebuffer(screen, ctx->framebuffer, rp);
+   ctx->fb_changed = false;
+   ctx->gfx_pipeline_state.render_pass = rp;
 }
 
 static unsigned
@@ -1548,14 +1562,21 @@ zink_set_framebuffer_state(struct pipe_context *pctx,
 
    for (int i = 0; i < ctx->fb_state.nr_cbufs; i++) {
       struct pipe_surface *surf = ctx->fb_state.cbufs[i];
-      if (surf && (i >= state->nr_cbufs || surf != state->cbufs[i]))
+      if (surf && (i >= state->nr_cbufs || surf != state->cbufs[i])) {
          zink_fb_clears_apply(ctx, surf->texture);
+         ctx->rp_changed = true;
+      }
    }
    if (ctx->fb_state.zsbuf) {
       struct pipe_surface *surf = ctx->fb_state.zsbuf;
-      if (surf != state->zsbuf)
+      if (surf != state->zsbuf) {
          zink_fb_clears_apply(ctx, ctx->fb_state.zsbuf->texture);
+         ctx->rp_changed = true;
+      }
    }
+   /* renderpass changes if the number or types of attachments change */
+   ctx->rp_changed |= ctx->fb_state.nr_cbufs != state->nr_cbufs;
+   ctx->rp_changed |= !!ctx->fb_state.zsbuf != !!state->zsbuf;
 
    util_copy_framebuffer_state(&ctx->fb_state, state);
    rebind_fb_state(ctx, NULL, true);
@@ -1581,6 +1602,7 @@ zink_set_framebuffer_state(struct pipe_context *pctx,
          _mesa_hash_table_remove(&screen->framebuffer_cache, he);
       simple_mtx_unlock(&screen->framebuffer_mtx);
    }
+   ctx->fb_changed |= ctx->framebuffer != fb;
    ctx->framebuffer = fb;
 
    uint8_t rast_samples = util_framebuffer_get_num_samples(state);
@@ -2798,6 +2820,7 @@ zink_context_create(struct pipe_screen *pscreen, void *priv, unsigned flags)
 
    ctx->gfx_pipeline_state.dirty = true;
    ctx->compute_pipeline_state.dirty = true;
+   ctx->fb_changed = ctx->rp_changed = true;
 
    ctx->base.screen = pscreen;
    ctx->base.priv = priv;

diff --git a/src/gallium/drivers/zink/zink_context.h b/src/gallium/drivers/zink/zink_context.h
index 1261964..fd03caa 100644 (file)
--- a/src/gallium/drivers/zink/zink_context.h
+++ b/src/gallium/drivers/zink/zink_context.h
@@ -185,6 +185,8 @@ struct zink_context {
 
    struct hash_table *render_pass_cache;
    bool new_swapchain;
+   bool fb_changed;
+   bool rp_changed;
 
    struct primconvert_context *primconvert;
 

diff --git a/src/gallium/drivers/zink/zink_render_pass.h b/src/gallium/drivers/zink/zink_render_pass.h
index 920a56b..2525695 100644 (file)
--- a/src/gallium/drivers/zink/zink_render_pass.h
+++ b/src/gallium/drivers/zink/zink_render_pass.h
@@ -45,9 +45,7 @@ struct zink_render_pass_state {
    bool swapchain_init;
    struct zink_rt_attrib rts[PIPE_MAX_COLOR_BUFS + 1];
    unsigned num_rts;
-#ifndef NDEBUG
-   uint32_t clears; //for extra verification
-#endif
+   uint32_t clears; //for extra verification and update flagging
 };
 
 struct zink_render_pass {