OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

radeonsi: remove SI_OP_CS_IMAGE

Browse Source 
it's redundant now

Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31193>
This commit is contained in:
Marek Olšák
2024-08-20 06:12:47 -04:00
committed by Marge Bot
parent 58d22e41af
commit 35727d2e9c
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/gallium/drivers/radeonsi/si_compute_blit.c
View File

@@ -118,16 +118,17 @@ void si_barrier_after_internal_op(struct si_context *sctx, unsigned flags,
if (flags & SI_OP_SYNC_AFTER) {
sctx->flags |= SI_CONTEXT_CS_PARTIAL_FLUSH;
if (flags & SI_OP_CS_IMAGE) {
if (num_images) {
/* Make sure image stores are visible to CB, which doesn't use L2 on GFX6-8. */
sctx->flags |= sctx->gfx_level <= GFX8 ? SI_CONTEXT_WB_L2 : 0;
/* Make sure image stores are visible to all CUs. */
sctx->flags |= SI_CONTEXT_INV_VCACHE;
} else {
/* Make sure buffer stores are visible to all CUs. */
sctx->flags |= SI_CONTEXT_INV_SCACHE | SI_CONTEXT_INV_VCACHE | SI_CONTEXT_PFP_SYNC_ME;
}
/* Make sure buffer stores are visible to all CUs and also as index/indirect buffers. */
if (num_buffers)
sctx->flags |= SI_CONTEXT_INV_SCACHE | SI_CONTEXT_INV_VCACHE | SI_CONTEXT_PFP_SYNC_ME;
si_mark_atom_dirty(sctx, &sctx->atoms.s.cache_flush);
}
@@ -514,7 +515,6 @@ static void si_launch_grid_internal_images(struct si_context *sctx,
*/
si_compute_save_and_bind_images(sctx, num_images, images, saved_images);
flags |= SI_OP_CS_IMAGE;
si_barrier_before_internal_op(sctx, flags, 0, NULL, 0, num_images, images);
si_compute_begin_internal(sctx, flags);
si_launch_grid_internal(sctx, info, shader);
@@ -1008,7 +1008,6 @@ bool si_compute_blit(struct si_context *sctx, const struct pipe_blit_info *info,
/* This must be before the barrier and si_compute_begin_internal because it might invoke DCC
* decompression.
*/
flags |= SI_OP_CS_IMAGE;
si_compute_save_and_bind_images(sctx, num_images, image, saved_images);
si_barrier_before_internal_op(sctx, flags, 0, NULL, 0, num_images, image);
si_compute_begin_internal(sctx, flags);

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

@@ -1465,7 +1465,7 @@ void si_destroy_compute(struct si_compute *program);
#define SI_OP_SYNC_AFTER (1 << 3)
#define SI_OP_SYNC_BEFORE_AFTER (SI_OP_SYNC_BEFORE | SI_OP_SYNC_AFTER)
#define SI_OP_SKIP_CACHE_INV_BEFORE (1 << 4) /* don't invalidate caches */
#define SI_OP_CS_IMAGE (1 << 5)
/* gap */
#define SI_OP_CS_RENDER_COND_ENABLE (1 << 6)
/* gap */
/* Only for si_compute_blit: */