KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

radeonsi: fix 2 issues with depth_cleared_level_mask 

- Unset depth_cleared_level_mask for non-clear blits. Set the flag after
  the clear, so that we don't have to check blitter_running.
- Set depth_cleared_level_mask only when we set depth_clear_value.

Fixes: ff8a930cf7 - radeonsi: add _once suffix to depth_cleared_level_mask

Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13603>
This commit is contained in:
Marek Olšák 2021-10-29 13:27:54 -04:00 committed by Marge Bot
parent 4885e63a6d
commit 5d3aea49b8
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/gallium/drivers/radeonsi/si_clear.c
View File

@ -803,6 +803,7 @@ static void si_fast_clear(struct si_context *sctx, unsigned *buffers,
clear_value = si_get_htile_clear_value(zstex, depth);
*buffers &= ~PIPE_CLEAR_DEPTH;
zstex->depth_cleared_level_mask_once |= BITFIELD_BIT(level);
zstex->depth_cleared_level_mask |= BITFIELD_BIT(level);
update_db_depth_clear = true;
}
} else if ((*buffers & PIPE_BIND_DEPTH_STENCIL) == PIPE_BIND_DEPTH_STENCIL) {
@ -812,6 +813,7 @@ static void si_fast_clear(struct si_context *sctx, unsigned *buffers,
clear_value = si_get_htile_clear_value(zstex, depth);
*buffers &= ~PIPE_CLEAR_DEPTHSTENCIL;
zstex->depth_cleared_level_mask_once |= BITFIELD_BIT(level);
zstex->depth_cleared_level_mask |= BITFIELD_BIT(level);
zstex->stencil_cleared_level_mask |= BITFIELD_BIT(level);
update_db_depth_clear = true;
update_db_stencil_clear = true;
@ -876,6 +878,7 @@ static void si_fast_clear(struct si_context *sctx, unsigned *buffers,
clear_types |= SI_CLEAR_TYPE_HTILE;
*buffers &= ~PIPE_CLEAR_DEPTH;
zstex->depth_cleared_level_mask_once |= BITFIELD_BIT(level);
zstex->depth_cleared_level_mask |= BITFIELD_BIT(level);
update_db_depth_clear = true;
}
} else if ((*buffers & PIPE_BIND_DEPTH_STENCIL) == PIPE_BIND_DEPTH_STENCIL) {
@ -889,6 +892,7 @@ static void si_fast_clear(struct si_context *sctx, unsigned *buffers,
clear_types |= SI_CLEAR_TYPE_HTILE;
*buffers &= ~PIPE_CLEAR_DEPTHSTENCIL;
zstex->depth_cleared_level_mask_once |= BITFIELD_BIT(level);
zstex->depth_cleared_level_mask |= BITFIELD_BIT(level);
zstex->stencil_cleared_level_mask |= BITFIELD_BIT(level);
update_db_depth_clear = true;
update_db_stencil_clear = true;
@ -914,6 +918,7 @@ static void si_fast_clear(struct si_context *sctx, unsigned *buffers,
clear_types |= SI_CLEAR_TYPE_HTILE;
*buffers &= ~PIPE_CLEAR_DEPTH;
zstex->depth_cleared_level_mask_once |= BITFIELD_BIT(level);
zstex->depth_cleared_level_mask |= BITFIELD_BIT(level);
update_db_depth_clear = true;
} else if (htile_size &&
!(*buffers & PIPE_CLEAR_DEPTH) &&
@ -971,9 +976,6 @@ static void si_clear(struct pipe_context *ctx, unsigned buffers,
else if (!util_format_has_stencil(util_format_description(zsbuf->format)))
buffers &= ~PIPE_CLEAR_STENCIL;
if (buffers & PIPE_CLEAR_DEPTH)
zstex->depth_cleared_level_mask |= BITFIELD_BIT(zsbuf->u.tex.level);
si_fast_clear(sctx, &buffers, color, depth, stencil);
if (!buffers)
return; /* all buffers have been cleared */
@ -1056,6 +1058,7 @@ static void si_clear(struct pipe_context *ctx, unsigned buffers,
sctx->db_depth_clear = false;
sctx->db_depth_disable_expclear = false;
zstex->depth_cleared_level_mask_once |= BITFIELD_BIT(zsbuf->u.tex.level);
zstex->depth_cleared_level_mask |= BITFIELD_BIT(zsbuf->u.tex.level);
si_mark_atom_dirty(sctx, &sctx->atoms.s.db_render_state);
}

2
src/gallium/drivers/radeonsi/si_pipe.h
View File

@ -387,7 +387,7 @@ struct si_texture {
float depth_clear_value[RADEON_SURF_MAX_LEVELS];
uint8_t stencil_clear_value[RADEON_SURF_MAX_LEVELS];
uint16_t depth_cleared_level_mask_once; /* if it was cleared at least once */
uint16_t depth_cleared_level_mask; /* track if it was cleared (not 100% accurate) */
uint16_t depth_cleared_level_mask; /* track if it's cleared (can be false negative) */
uint16_t stencil_cleared_level_mask; /* if it was cleared at least once */
uint16_t dirty_level_mask; /* each bit says if that mipmap is compressed */
uint16_t stencil_dirty_level_mask; /* each bit says if that mipmap is compressed */

2
src/gallium/drivers/radeonsi/si_state_draw.cpp
View File

@ -2463,7 +2463,7 @@ static void si_draw(struct pipe_context *ctx,
sctx->num_prim_restart_calls += num_draws;
}
if (!sctx->blitter_running && sctx->framebuffer.state.zsbuf) {
if (sctx->framebuffer.state.zsbuf) {
struct si_texture *zstex = (struct si_texture *)sctx->framebuffer.state.zsbuf->texture;
zstex->depth_cleared_level_mask &= ~BITFIELD_BIT(sctx->framebuffer.state.zsbuf->u.tex.level);
}