panvk: Use vk_image_buffer_copy_layout

Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16873>
This commit is contained in:
Jason Ekstrand
2022-06-06 08:27:41 -05:00
committed by Marge Bot
parent 8d6b7eb5ce
commit 420717b2ce
+4 -5
View File
@@ -1152,15 +1152,14 @@ panvk_meta_copy_buf2img(struct panvk_cmd_buffer *cmdbuf,
const struct panfrost_ubo_push *pushmap =
&cmdbuf->device->physical_device->meta.copy.buf2img[fmtidx].pushmap;
unsigned buftexelsz = panvk_meta_copy_buf_texelsize(key.imgfmt, key.mask);
const struct vk_image_buffer_layout buflayout =
vk_image_buffer_copy_layout(&img->vk, region);
struct panvk_meta_copy_buf2img_info info = {
.buf.ptr = panvk_buffer_gpu_ptr(buf, region->bufferOffset),
.buf.stride.line = (region->bufferRowLength ? : region->imageExtent.width) * buftexelsz,
.buf.stride.line = buflayout.row_stride_B,
.buf.stride.surf = buflayout.image_stride_B,
};
info.buf.stride.surf =
(region->bufferImageHeight ? : region->imageExtent.height) * info.buf.stride.line;
mali_ptr pushconsts =
panvk_meta_copy_emit_push_constants(pdev, pushmap, &cmdbuf->desc_pool.base,
&info, sizeof(info));