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

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

Browse source 
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>
This commit is contained in:
Mike Blumenkrantz 2021-03-03 15:56:14 -05:00 • committed by Marge Bot
parent b11b1968ee
commit f1ec655e47
3 changed files with 32 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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;

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

@ -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;

4
src/gallium/drivers/zink/zink_render_pass.h
View file

@ -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 {