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

radv: rework radv_handle_color_image_transition()

Browse source 
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33639>
This commit is contained in:
Samuel Pitoiset 2025-02-20 12:04:15 +01:00 • committed by Marge Bot
parent 7bb3a2363d
commit 09d91837e4
1 changed files with 33 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
src/amd/vulkan/radv_cmd_buffer.c
View file

@ -12643,7 +12643,8 @@ radv_handle_color_image_transition(struct radv_cmd_buffer *cmd_buffer, struct ra
unsigned dst_queue_mask, const VkImageSubresourceRange *range) unsigned dst_queue_mask, const VkImageSubresourceRange *range)
{ {
struct radv_device *device = radv_cmd_buffer_device(cmd_buffer); struct radv_device *device = radv_cmd_buffer_device(cmd_buffer);
bool dcc_decompressed = false, fast_clear_flushed = false; bool needs_dcc_decompress = false, needs_dcc_retile = false;
bool needs_fast_clear_flush = false, needs_fmask_color_expand = false;
if (!radv_image_has_cmask(image) && !radv_image_has_fmask(image) && !radv_dcc_enabled(image, range->baseMipLevel)) if (!radv_image_has_cmask(image) && !radv_image_has_fmask(image) && !radv_dcc_enabled(image, range->baseMipLevel))
return; return;
@ -12661,52 +12662,51 @@ radv_handle_color_image_transition(struct radv_cmd_buffer *cmd_buffer, struct ra
cmd_buffer->state.flush_bits |= radv_init_dcc(cmd_buffer, image, range, 0xffffffffu); cmd_buffer->state.flush_bits |= radv_init_dcc(cmd_buffer, image, range, 0xffffffffu);
} else if (radv_layout_dcc_compressed(device, image, range->baseMipLevel, src_layout, src_queue_mask) && } else if (radv_layout_dcc_compressed(device, image, range->baseMipLevel, src_layout, src_queue_mask) &&
!radv_layout_dcc_compressed(device, image, range->baseMipLevel, dst_layout, dst_queue_mask)) { !radv_layout_dcc_compressed(device, image, range->baseMipLevel, dst_layout, dst_queue_mask)) {
radv_decompress_dcc(cmd_buffer, image, range); needs_dcc_decompress = true;
dcc_decompressed = true;
} else if (radv_layout_can_fast_clear(device, image, range->baseMipLevel, src_layout, src_queue_mask) &&
!radv_layout_can_fast_clear(device, image, range->baseMipLevel, dst_layout, dst_queue_mask)) {
radv_fast_clear_flush_image_inplace(cmd_buffer, image, range);
fast_clear_flushed = true;
} }
if (radv_image_need_retile(cmd_buffer, image)) if (radv_image_need_retile(cmd_buffer, image))
radv_retile_transition(cmd_buffer, image, src_layout, dst_layout, dst_queue_mask); needs_dcc_retile = true;
} else if (radv_image_has_cmask(image) || radv_image_has_fmask(image)) { }
if (radv_layout_can_fast_clear(device, image, range->baseMipLevel, src_layout, src_queue_mask) &&
!radv_layout_can_fast_clear(device, image, range->baseMipLevel, dst_layout, dst_queue_mask)) { if (radv_layout_can_fast_clear(device, image, range->baseMipLevel, src_layout, src_queue_mask) &&
radv_fast_clear_flush_image_inplace(cmd_buffer, image, range); !radv_layout_can_fast_clear(device, image, range->baseMipLevel, dst_layout, dst_queue_mask)) {
fast_clear_flushed = true; needs_fast_clear_flush = true;
}
} }
/* MSAA color decompress. */
const enum radv_fmask_compression src_fmask_comp = const enum radv_fmask_compression src_fmask_comp =
radv_layout_fmask_compression(device, image, src_layout, src_queue_mask); radv_layout_fmask_compression(device, image, src_layout, src_queue_mask);
const enum radv_fmask_compression dst_fmask_comp = const enum radv_fmask_compression dst_fmask_comp =
radv_layout_fmask_compression(device, image, dst_layout, dst_queue_mask); radv_layout_fmask_compression(device, image, dst_layout, dst_queue_mask);
if (src_fmask_comp <= dst_fmask_comp)
return;
if (src_fmask_comp == RADV_FMASK_COMPRESSION_FULL) { if (src_fmask_comp > dst_fmask_comp) {
if (radv_dcc_enabled(image, range->baseMipLevel) && !radv_image_use_dcc_image_stores(device, image) && if (src_fmask_comp == RADV_FMASK_COMPRESSION_FULL) {
!dcc_decompressed) { if (radv_dcc_enabled(image, range->baseMipLevel) && !radv_image_use_dcc_image_stores(device, image)) {
/* A DCC decompress is required before expanding FMASK /* A DCC decompress is required before expanding FMASK when DCC stores aren't supported to
* when DCC stores aren't supported to avoid being in * avoid being in a state where DCC is compressed and the main surface is uncompressed.
* a state where DCC is compressed and the main */
* surface is uncompressed. needs_dcc_decompress = true;
*/ } else {
radv_decompress_dcc(cmd_buffer, image, range); /* FMASK_DECOMPRESS is required before expanding FMASK. */
} else if (!fast_clear_flushed) { needs_fast_clear_flush = true;
/* A FMASK decompress is required before expanding }
* FMASK.
*/
radv_fast_clear_flush_image_inplace(cmd_buffer, image, range);
} }
if (dst_fmask_comp == RADV_FMASK_COMPRESSION_NONE)
needs_fmask_color_expand = true;
} }
if (dst_fmask_comp == RADV_FMASK_COMPRESSION_NONE) { if (needs_dcc_decompress) {
radv_fmask_color_expand(cmd_buffer, image, range); radv_decompress_dcc(cmd_buffer, image, range);
} else if (needs_fast_clear_flush) {
radv_fast_clear_flush_image_inplace(cmd_buffer, image, range);
} }
if (needs_fmask_color_expand)
radv_fmask_color_expand(cmd_buffer, image, range);
if (needs_dcc_retile)
radv_retile_transition(cmd_buffer, image, src_layout, dst_layout, dst_queue_mask);
} }
static void static void