fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-03-06 03:30:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

radv: Use vk_image_buffer_copy_layout

Browse source 
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16873>
This commit is contained in:
Jason Ekstrand 2022-06-06 08:22:12 -05:00 • committed by Marge Bot
parent c144030f7e
commit 8d6b7eb5ce
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/amd/vulkan/radv_meta_copy.c
View file

@ -122,11 +122,6 @@ copy_buffer_to_image(struct radv_cmd_buffer *cmd_buffer, struct radv_buffer *buf
* blocks - which is the highest resolution accessible in this command.
*/
const VkOffset3D img_offset_el = vk_image_offset_to_elements(&image->vk, region->imageOffset);
const VkExtent3D bufferExtent = {
.width = region->bufferRowLength ? region->bufferRowLength : region->imageExtent.width,
.height = region->bufferImageHeight ? region->bufferImageHeight : region->imageExtent.height,
};
const VkExtent3D buf_extent_el = vk_image_extent_to_elements(&image->vk, bufferExtent);
/* Start creating blit rect */
const VkExtent3D img_extent_el = vk_image_extent_to_elements(&image->vk, region->imageExtent);
@ -159,12 +154,13 @@ copy_buffer_to_image(struct radv_cmd_buffer *cmd_buffer, struct radv_buffer *buf
img_bsurf.format = vk_format_for_size(vk_format_get_blocksize(img_bsurf.format));
}
const struct vk_image_buffer_layout buf_layout = vk_image_buffer_copy_layout(&image->vk, region);
struct radv_meta_blit2d_buffer buf_bsurf = {
.bs = img_bsurf.bs,
.format = img_bsurf.format,
.buffer = buffer,
.offset = region->bufferOffset,
.pitch = buf_extent_el.width,
.pitch = buf_layout.row_stride_B / buf_layout.element_size_B,
};
if (image->vk.image_type == VK_IMAGE_TYPE_3D)
@ -191,7 +187,7 @@ copy_buffer_to_image(struct radv_cmd_buffer *cmd_buffer, struct radv_buffer *buf
* increment the offset directly in the image effectively
* re-binding it to different backing memory.
*/
buf_bsurf.offset += buf_extent_el.width * buf_extent_el.height * buf_bsurf.bs;
buf_bsurf.offset += buf_layout.image_stride_B;
img_bsurf.layer++;
if (image->vk.image_type == VK_IMAGE_TYPE_3D)
slice_3d++;