fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-09 02:28:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

radv: perform proper layout transitions before resolving

Browse source 
Use an explicit pipeline barrier for doing layout transitions
instead of duplicating some code.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-By: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
This commit is contained in:
Samuel Pitoiset 2019-06-10 17:45:30 +02:00
parent 92fa6264cb
commit c31a07fa85
1 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/amd/vulkan/radv_meta_resolve.c
View file

@ -743,24 +743,24 @@ radv_decompress_resolve_src(struct radv_cmd_buffer *cmd_buffer,
const uint32_t src_base_layer = const uint32_t src_base_layer =
radv_meta_get_iview_layer(src_image, &region->srcSubresource, radv_meta_get_iview_layer(src_image, &region->srcSubresource,
&region->srcOffset); &region->srcOffset);
VkImageSubresourceRange range;
range.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
range.baseMipLevel = region->srcSubresource.mipLevel;
range.levelCount = 1;
range.baseArrayLayer = src_base_layer;
range.layerCount = region->srcSubresource.layerCount;
uint32_t queue_mask = VkImageMemoryBarrier barrier = {};
radv_image_queue_family_mask(src_image, barrier.srcAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT;
cmd_buffer->queue_family_index, barrier.dstAccessMask = VK_ACCESS_TRANSFER_READ_BIT;
cmd_buffer->queue_family_index); barrier.oldLayout = src_image_layout;
barrier.newLayout = VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL;
barrier.image = radv_image_to_handle(src_image);
barrier.subresourceRange = (VkImageSubresourceRange) {
.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT,
.baseMipLevel = region->srcSubresource.mipLevel,
.levelCount = 1,
.baseArrayLayer = src_base_layer,
.layerCount = region->srcSubresource.layerCount,
};
if (radv_layout_dcc_compressed(src_image, src_image_layout, radv_CmdPipelineBarrier(radv_cmd_buffer_to_handle(cmd_buffer),
queue_mask)) { VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT,
radv_decompress_dcc(cmd_buffer, src_image, &range); VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT,
} else { false, 0, NULL, 0, NULL, 1, &barrier);
radv_fast_clear_flush_image_inplace(cmd_buffer,
src_image, &range);
}
} }
} }