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

zink: also defer fb clears when conditional render is active

Browse source 
this just requires adding an explicit flush for the deferred clears in
case conditional rendering is disabled before a draw happens

Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9206>
This commit is contained in:
Mike Blumenkrantz 2020-09-17 16:08:39 -04:00 • committed by Marge Bot
parent 5c629e9ff2
commit 48716b1431
3 changed files with 33 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/gallium/drivers/zink/zink_clear.c
View file

@ -216,7 +216,7 @@ zink_clear(struct pipe_context *pctx,
}
if (batch->in_rp || ctx->render_condition_active) {
if (batch->in_rp) {
clear_in_rp(pctx, buffers, scissor_state, pcolor, depth, stencil);
return;
}
@ -229,6 +229,7 @@ zink_clear(struct pipe_context *pctx,
struct zink_framebuffer_clear_data *clear = get_clear_data(ctx, fb_clear, needs_rp ? scissor_state : NULL);
fb_clear->enabled = true;
clear->conditional = ctx->render_condition_active;
clear->has_scissor = needs_rp;
if (scissor_state && needs_rp)
clear->scissor = *scissor_state;
@ -243,6 +244,7 @@ zink_clear(struct pipe_context *pctx,
struct zink_framebuffer_clear *fb_clear = &ctx->fb_clears[PIPE_MAX_COLOR_BUFS];
struct zink_framebuffer_clear_data *clear = get_clear_data(ctx, fb_clear, needs_rp ? scissor_state : NULL);
fb_clear->enabled = true;
clear->conditional = ctx->render_condition_active;
clear->has_scissor = needs_rp;
if (scissor_state && needs_rp)
clear->scissor = *scissor_state;
@ -422,7 +424,7 @@ zink_fb_clear_needs_explicit(struct zink_framebuffer_clear *fb_clear)
if (zink_fb_clear_count(fb_clear) != 1)
return true;
struct zink_framebuffer_clear_data *clear = zink_fb_clear_element(fb_clear, 0);
return clear->has_scissor;
return clear->has_scissor || clear->conditional;
}
void
@ -503,3 +505,27 @@ zink_fb_clears_discard(struct zink_context *ctx, struct pipe_resource *pres)
}
}
void
zink_clear_apply_conditionals(struct zink_context *ctx)
{
for (int i = 0; i < ARRAY_SIZE(ctx->fb_clears); i++) {
struct zink_framebuffer_clear *fb_clear = &ctx->fb_clears[i];
if (!fb_clear->enabled)
continue;
for (int j = 0; j < zink_fb_clear_count(fb_clear); j++) {
struct zink_framebuffer_clear_data *clear = zink_fb_clear_element(fb_clear, j);
if (clear->conditional) {
struct pipe_surface *surf;
if (i < PIPE_MAX_COLOR_BUFS)
surf = ctx->fb_state.cbufs[i];
else
surf = ctx->fb_state.zsbuf;
if (surf)
zink_fb_clears_apply(ctx, surf->texture);
else
zink_fb_clear_reset(&ctx->fb_clears[i]);
break;
}
}
}
}

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

@ -110,6 +110,7 @@ struct zink_framebuffer_clear_data {
};
struct pipe_scissor_state scissor;
bool has_scissor;
bool conditional;
};
struct zink_framebuffer_clear {
@ -317,6 +318,9 @@ zink_fb_clear_reset(struct zink_framebuffer_clear *fb_clear)
fb_clear->enabled = false;
}
void
zink_clear_apply_conditionals(struct zink_context *ctx);
void
zink_fb_clears_apply(struct zink_context *ctx, struct pipe_resource *pres);

1
src/gallium/drivers/zink/zink_query.c
View file

@ -704,6 +704,7 @@ zink_render_condition(struct pipe_context *pctx,
VkQueryResultFlagBits flags = 0;
if (query == NULL) {
zink_clear_apply_conditionals(ctx);
screen->vk_CmdEndConditionalRenderingEXT(batch->cmdbuf);
ctx->render_condition_active = false;
return;