diff options
| author | Bas Nieuwenhuizen <[email protected]> | 2019-02-17 22:17:53 +0100 |
|---|---|---|
| committer | Bas Nieuwenhuizen <[email protected]> | 2019-04-25 19:56:20 +0000 |
| commit | a83776885705543ef6ecb9cee864f5ac68a89aa9 (patch) | |
| tree | 56fa4d614679b6ec90bf92d5ec2ab5fcc73244d2 /src/amd/vulkan | |
| parent | 66507cc6563e0f710e5b4553a1048be65eef9559 (diff) | |
radv: Support different source & dest aspects for planar images in blit2d.
Reviewed-by: Samuel Pitoiset <[email protected]>
Diffstat (limited to 'src/amd/vulkan')
| -rw-r--r-- | src/amd/vulkan/radv_meta_blit2d.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/amd/vulkan/radv_meta_blit2d.c b/src/amd/vulkan/radv_meta_blit2d.c index c99d59c65d0..1fb5529b410 100644 --- a/src/amd/vulkan/radv_meta_blit2d.c +++ b/src/amd/vulkan/radv_meta_blit2d.c @@ -256,13 +256,17 @@ radv_meta_blit2d_normal_dst(struct radv_cmd_buffer *cmd_buffer, unsigned i; for_each_bit(i, dst->aspect_mask) { unsigned aspect_mask = 1u << i; + unsigned src_aspect_mask = aspect_mask; VkFormat depth_format = 0; if (aspect_mask == VK_IMAGE_ASPECT_STENCIL_BIT) depth_format = vk_format_stencil_only(dst->image->vk_format); else if (aspect_mask == VK_IMAGE_ASPECT_DEPTH_BIT) depth_format = vk_format_depth_only(dst->image->vk_format); + else if (src_img) + src_aspect_mask = src_img->aspect_mask; + struct blit2d_src_temps src_temps; - blit2d_bind_src(cmd_buffer, src_img, src_buf, &src_temps, src_type, depth_format, aspect_mask, log2_samples); + blit2d_bind_src(cmd_buffer, src_img, src_buf, &src_temps, src_type, depth_format, src_aspect_mask, log2_samples); struct blit2d_dst_temps dst_temps; blit2d_bind_dst(cmd_buffer, dst, rects[r].dst_x + rects[r].width, @@ -280,7 +284,10 @@ radv_meta_blit2d_normal_dst(struct radv_cmd_buffer *cmd_buffer, VK_SHADER_STAGE_VERTEX_BIT, 0, 16, vertex_push_constants); - if (aspect_mask == VK_IMAGE_ASPECT_COLOR_BIT) { + if (aspect_mask == VK_IMAGE_ASPECT_COLOR_BIT || + aspect_mask == VK_IMAGE_ASPECT_PLANE_0_BIT || + aspect_mask == VK_IMAGE_ASPECT_PLANE_1_BIT || + aspect_mask == VK_IMAGE_ASPECT_PLANE_2_BIT) { unsigned fs_key = radv_format_meta_fs_key(dst_temps.iview.vk_format); unsigned dst_layout = radv_meta_dst_layout_from_layout(dst->current_layout); |