diff --git a/src/gallium/drivers/radeonsi/si_blit.c b/src/gallium/drivers/radeonsi/si_blit.c index 8191d024931..7bbe5143825 100644 --- a/src/gallium/drivers/radeonsi/si_blit.c +++ b/src/gallium/drivers/radeonsi/si_blit.c @@ -968,7 +968,7 @@ void si_resource_copy_region(struct pipe_context *ctx, struct pipe_resource *dst return; } - if (si_compute_copy_image(sctx, dst, dst_level, src, src_level, dstx, dsty, dstz, + if (si_compute_copy_image_old(sctx, dst, dst_level, src, src_level, dstx, dsty, dstz, src_box, SI_OP_SYNC_BEFORE_AFTER)) return; @@ -1213,7 +1213,7 @@ static void si_blit(struct pipe_context *ctx, const struct pipe_blit_info *info) si_init_aux_async_compute_ctx(sscreen); if (sscreen->async_compute_context) { - si_compute_copy_image((struct si_context*)sctx->screen->async_compute_context, + si_compute_copy_image_old((struct si_context*)sctx->screen->async_compute_context, info->dst.resource, 0, info->src.resource, 0, 0, 0, 0, &info->src.box, 0); si_flush_gfx_cs((struct si_context*)sctx->screen->async_compute_context, 0, NULL); diff --git a/src/gallium/drivers/radeonsi/si_compute_blit.c b/src/gallium/drivers/radeonsi/si_compute_blit.c index ae019cbf6d2..b133156b4fd 100644 --- a/src/gallium/drivers/radeonsi/si_compute_blit.c +++ b/src/gallium/drivers/radeonsi/si_compute_blit.c @@ -553,7 +553,7 @@ static void si_launch_grid_internal_images(struct si_context *sctx, pipe_resource_reference(&saved_image[i].resource, NULL); } -bool si_compute_copy_image(struct si_context *sctx, struct pipe_resource *dst, unsigned dst_level, +bool si_compute_copy_image_old(struct si_context *sctx, struct pipe_resource *dst, unsigned dst_level, struct pipe_resource *src, unsigned src_level, unsigned dstx, unsigned dsty, unsigned dstz, const struct pipe_box *src_box, unsigned flags) diff --git a/src/gallium/drivers/radeonsi/si_pipe.h b/src/gallium/drivers/radeonsi/si_pipe.h index fb14722f9b4..c0705fc3464 100644 --- a/src/gallium/drivers/radeonsi/si_pipe.h +++ b/src/gallium/drivers/radeonsi/si_pipe.h @@ -1502,7 +1502,7 @@ void si_copy_buffer(struct si_context *sctx, struct pipe_resource *dst, struct p uint64_t dst_offset, uint64_t src_offset, unsigned size, unsigned flags); void si_compute_shorten_ubyte_buffer(struct si_context *sctx, struct pipe_resource *dst, struct pipe_resource *src, uint64_t dst_offset, uint64_t src_offset, unsigned size, unsigned flags); -bool si_compute_copy_image(struct si_context *sctx, struct pipe_resource *dst, unsigned dst_level, +bool si_compute_copy_image_old(struct si_context *sctx, struct pipe_resource *dst, unsigned dst_level, struct pipe_resource *src, unsigned src_level, unsigned dstx, unsigned dsty, unsigned dstz, const struct pipe_box *src_box, unsigned flags);