radeonsi: switch the old compute image copy to the new one using the blit

Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28917>
This commit is contained in:
Marek Olšák
2024-03-25 20:54:26 -04:00
committed by Marge Bot
parent f3a59fe216
commit b0c0cca3a7

View File

@@ -968,8 +968,7 @@ void si_resource_copy_region(struct pipe_context *ctx, struct pipe_resource *dst
return; return;
} }
if (si_compute_copy_image_old(sctx, dst, dst_level, src, src_level, dstx, dsty, dstz, if (si_compute_copy_image(sctx, dst, dst_level, src, src_level, dstx, dsty, dstz, src_box, true))
src_box, SI_OP_SYNC_BEFORE_AFTER))
return; return;
si_gfx_copy_image(sctx, dst, dst_level, dstx, dsty, dstz, src, src_level, src_box); si_gfx_copy_image(sctx, dst, dst_level, dstx, dsty, dstz, src, src_level, src_box);
@@ -1213,9 +1212,9 @@ static void si_blit(struct pipe_context *ctx, const struct pipe_blit_info *info)
si_init_aux_async_compute_ctx(sscreen); si_init_aux_async_compute_ctx(sscreen);
if (sscreen->async_compute_context) { if (sscreen->async_compute_context) {
si_compute_copy_image_old((struct si_context*)sctx->screen->async_compute_context, si_compute_copy_image((struct si_context*)sctx->screen->async_compute_context,
info->dst.resource, 0, info->src.resource, 0, 0, 0, 0, info->dst.resource, 0, info->src.resource, 0, 0, 0, 0,
&info->src.box, 0); &info->src.box, false);
si_flush_gfx_cs((struct si_context*)sctx->screen->async_compute_context, 0, NULL); si_flush_gfx_cs((struct si_context*)sctx->screen->async_compute_context, 0, NULL);
simple_mtx_unlock(&sscreen->async_compute_context_lock); simple_mtx_unlock(&sscreen->async_compute_context_lock);
return; return;