fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 21:50:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

radv: decompress DCC for multisampled source images before resolving

Browse source 
Multisampled source images (ie. color attachments) can be now
DCC compressed, so the driver needs to perform a DCC decompression
pass before resolving

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
This commit is contained in:
Samuel Pitoiset 2018-04-17 16:05:17 +02:00
parent 1aefb62f1e
commit dc3d39771f
4 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/amd/vulkan/radv_meta.h
View file

@ -195,6 +195,7 @@ void radv_decompress_resolve_subpass_src(struct radv_cmd_buffer *cmd_buffer);
void radv_decompress_resolve_src(struct radv_cmd_buffer *cmd_buffer,
struct radv_image *src_image,
VkImageLayout src_image_layout,
uint32_t region_count,
const VkImageResolve *regions);

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

@ -697,7 +697,8 @@ radv_decompress_resolve_subpass_src(struct radv_cmd_buffer *cmd_buffer)
region.srcSubresource.mipLevel = 0;
region.srcSubresource.layerCount = 1;
radv_decompress_resolve_src(cmd_buffer, src_image, 1, &region);
radv_decompress_resolve_src(cmd_buffer, src_image,
src_att.layout, 1, &region);
}
}
@ -707,6 +708,7 @@ radv_decompress_resolve_subpass_src(struct radv_cmd_buffer *cmd_buffer)
void
radv_decompress_resolve_src(struct radv_cmd_buffer *cmd_buffer,
struct radv_image *src_image,
VkImageLayout src_image_layout,
uint32_t region_count,
const VkImageResolve *regions)
{
@ -722,6 +724,17 @@ radv_decompress_resolve_src(struct radv_cmd_buffer *cmd_buffer,
range.baseArrayLayer = src_base_layer;
range.layerCount = region->srcSubresource.layerCount;
radv_fast_clear_flush_image_inplace(cmd_buffer, src_image, &range);
uint32_t queue_mask =
radv_image_queue_family_mask(src_image,
cmd_buffer->queue_family_index,
cmd_buffer->queue_family_index);
if (radv_layout_dcc_compressed(src_image, src_image_layout,
queue_mask)) {
radv_decompress_dcc(cmd_buffer, src_image, &range);
} else {
radv_fast_clear_flush_image_inplace(cmd_buffer,
src_image, &range);
}
}
}

2
src/amd/vulkan/radv_meta_resolve_cs.c
View file

@ -388,7 +388,7 @@ void radv_meta_resolve_compute_image(struct radv_cmd_buffer *cmd_buffer,
{
struct radv_meta_saved_state saved_state;
radv_decompress_resolve_src(cmd_buffer, src_image,
radv_decompress_resolve_src(cmd_buffer, src_image, src_image_layout,
region_count, regions);
radv_meta_save(&saved_state, cmd_buffer,

2
src/amd/vulkan/radv_meta_resolve_fs.c
View file

@ -458,7 +458,7 @@ void radv_meta_resolve_fragment_image(struct radv_cmd_buffer *cmd_buffer,
unsigned dst_layout = radv_meta_dst_layout_from_layout(dest_image_layout);
VkRenderPass rp;
radv_decompress_resolve_src(cmd_buffer, src_image,
radv_decompress_resolve_src(cmd_buffer, src_image, src_image_layout,
region_count, regions);
rp = device->meta_state.resolve_fragment.rc[samples_log2].render_pass[fs_key][dst_layout];