Module: Mesa Branch: main Commit: 7d0dbdeca29c955ca8bb220a02182ba75cbe0855 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=7d0dbdeca29c955ca8bb220a02182ba75cbe0855
Author: Mike Blumenkrantz <[email protected]> Date: Fri Oct 13 08:34:29 2023 -0400 zink: assert that transfer_dst is available before doing buf2img the blitter path here was just wishful thinking anyway Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25624> --- src/gallium/drivers/zink/zink_resource.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/gallium/drivers/zink/zink_resource.c b/src/gallium/drivers/zink/zink_resource.c index 1ba8be0b56d..b07bf408b55 100644 --- a/src/gallium/drivers/zink/zink_resource.c +++ b/src/gallium/drivers/zink/zink_resource.c @@ -1995,13 +1995,9 @@ zink_transfer_copy_bufimage(struct zink_context *ctx, if (buf2img) box.x = trans->offset; - if (dst->obj->transfer_dst) - zink_copy_image_buffer(ctx, dst, src, trans->base.b.level, buf2img ? x : 0, - box.y, box.z, trans->base.b.level, &box, trans->base.b.usage); - else - util_blitter_copy_texture(ctx->blitter, &dst->base.b, trans->base.b.level, - x, box.y, box.z, &src->base.b, - 0, &box); + assert(dst->obj->transfer_dst); + zink_copy_image_buffer(ctx, dst, src, trans->base.b.level, buf2img ? x : 0, + box.y, box.z, trans->base.b.level, &box, trans->base.b.usage); } ALWAYS_INLINE static void
