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

zink: lift clearing on fb state change up a level

Browse source 
in the scenario where:
* at least 1 color buffer was bound and a depth buffer was bound
* no color clear was enabled
* a zs clear was enabled
* the zs clear was never flushed
* the zs clear needs a renderpass
* the fb state changes

the color buffer(s) would be unbound, following which the depth buffer unbind
would trigger a renderpass, which would utilize the just-unbound color buffers,
which have no batch tracking, thus creating a case where the surface was destroyed
while it was still in use

cc: mesa-stable

Acked-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17366>
This commit is contained in:
Mike Blumenkrantz 2022-07-06 14:24:27 -04:00 • committed by Marge Bot
parent e81d6cec27
commit 66ceea7ed9
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2661,16 +2661,6 @@ unbind_fb_surface(struct zink_context *ctx, struct pipe_surface *surf, unsigned
struct zink_surface *transient = zink_transient_surface(surf); struct zink_surface *transient = zink_transient_surface(surf);
struct zink_resource *res = zink_resource(surf->texture); struct zink_resource *res = zink_resource(surf->texture);
if (changed) { if (changed) {
if (zink_fb_clear_enabled(ctx, idx)) {
if (zink_is_swapchain(res)) {
if (zink_kopper_acquire(ctx, res, UINT64_MAX)) {
zink_surface_swapchain_update(ctx, zink_csurface(surf));
zink_fb_clears_apply(ctx, surf->texture);
}
} else {
zink_fb_clears_apply(ctx, surf->texture);
}
}
if (zink_batch_usage_exists(zink_csurface(surf)->batch_uses)) { if (zink_batch_usage_exists(zink_csurface(surf)->batch_uses)) {
zink_batch_reference_surface(&ctx->batch, zink_csurface(surf)); zink_batch_reference_surface(&ctx->batch, zink_csurface(surf));
if (transient) if (transient)
@ -2713,6 +2703,15 @@ zink_set_framebuffer_state(struct pipe_context *pctx,
struct zink_context *ctx = zink_context(pctx); struct zink_context *ctx = zink_context(pctx);
unsigned samples = state->nr_cbufs || state->zsbuf ? 0 : state->samples; unsigned samples = state->nr_cbufs || state->zsbuf ? 0 : state->samples;
bool flush_clears = false;
for (int i = 0; i < ctx->fb_state.nr_cbufs; i++) {
if (i >= state->nr_cbufs || ctx->fb_state.cbufs[i] != state->cbufs[i])
flush_clears |= zink_fb_clear_enabled(ctx, i);
}
if (ctx->fb_state.zsbuf != state->zsbuf)
flush_clears |= zink_fb_clear_enabled(ctx, PIPE_MAX_COLOR_BUFS);
if (flush_clears)
zink_batch_rp(ctx);
for (int i = 0; i < ctx->fb_state.nr_cbufs; i++) { for (int i = 0; i < ctx->fb_state.nr_cbufs; i++) {
struct pipe_surface *psurf = ctx->fb_state.cbufs[i]; struct pipe_surface *psurf = ctx->fb_state.cbufs[i];
if (i < state->nr_cbufs) if (i < state->nr_cbufs)