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

anv: Fix the fast clear type for FCV writes

Browse source 
We started allowing non-default clear colors with FCV in commit
cd8e120b97. When rendering to an image with FCV, set the fast-clear
type to ANV_FAST_CLEAR_ANY if the image properties allow such
fast-clears.

Fixes: cd8e120b97 ("anv: Allow more single subresource fast-clears with FCV")
Reviewed-by: Jianxun Zhang <jianxun.zhang@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/37660>
(cherry picked from commit ce196c9de5)
This commit is contained in:
Nanley Chery 2025-11-24 16:05:30 -05:00 • committed by Eric Engestrom
parent f3db65d95e
commit c2eca1a1cc
3 changed files with 26 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -614,7 +614,7 @@
"description": "anv: Fix the fast clear type for FCV writes",
"nominated": true,
"nomination_type": 2,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "cd8e120b97d3d0ee69fd632fb7017b10fac13e77",
"notes": null

11
src/intel/vulkan/anv_image.c
View file

@ -3728,11 +3728,16 @@ anv_layout_to_fast_clear_type(const struct intel_device_info * const devinfo,
const VkImageLayout layout,
const VkQueueFlagBits queue_flags)
{
if (INTEL_DEBUG(DEBUG_NO_FAST_CLEAR))
return ANV_FAST_CLEAR_NONE;
const uint32_t plane = anv_image_aspect_to_plane(image, aspect);
/* Even without fast-clearing, some aux-usages may still end up with
* fast-cleared blocks.
*/
if (INTEL_DEBUG(DEBUG_NO_FAST_CLEAR)) {
return image->planes[plane].aux_usage == ISL_AUX_USAGE_FCV_CCS_E ?
ANV_FAST_CLEAR_DEFAULT_VALUE : ANV_FAST_CLEAR_NONE;
}
/* If there is no auxiliary surface allocated, there are no fast-clears */
if (image->planes[plane].aux_usage == ISL_AUX_USAGE_NONE)
return ANV_FAST_CLEAR_NONE;

30
src/intel/vulkan/genX_cmd_buffer.c
View file

@ -706,19 +706,20 @@ set_image_compressed_bit(struct anv_cmd_buffer *cmd_buffer,
mi_imm(compressed ? UINT32_MAX : 0));
}
/* FCV_CCS_E images are automatically fast cleared to default value at
* render time. In order to account for this, anv should set the the
* appropriate fast clear state for level0/layer0.
*
* At the moment, tracking the fast clear state for higher levels/layers is
* neither supported, nor do we enter a situation where it is a concern.
*/
if (image->planes[plane].aux_usage == ISL_AUX_USAGE_FCV_CCS_E &&
base_layer == 0 && level == 0) {
if (compressed &&
image->planes[plane].aux_usage == ISL_AUX_USAGE_FCV_CCS_E) {
/* FCV_CCS_E images may be automatically fast cleared at render time.
* If the write is compressed, the fast-clear type won't be dependent on
* the layout. So, just pick one we know supports compression.
*/
VkImageLayout layout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
enum anv_fast_clear_type render_fast_clear =
anv_layout_to_fast_clear_type(device->info, image, aspect, layout,
cmd_buffer->queue_family->queueFlags);
assert(render_fast_clear != ANV_FAST_CLEAR_NONE);
struct anv_address fc_type_addr =
anv_image_get_fast_clear_type_addr(device, image, aspect);
mi_store(&b, mi_mem32(fc_type_addr),
mi_imm(ANV_FAST_CLEAR_DEFAULT_VALUE));
mi_store(&b, mi_mem32(fc_type_addr), mi_imm(render_fast_clear));
}
}
@ -1284,8 +1285,11 @@ transition_color_buffer(struct anv_cmd_buffer *cmd_buffer,
/* Ensure the raw and converted clear colors are in sync. */
const uint32_t zero_pixel[4] = {};
set_image_clear_color(cmd_buffer, image, aspect, zero_pixel);
}
if (base_level == 0 && base_layer == 0) {
} else if (base_level == 0 && base_layer == 0) {
/* Set the initial clear type to NONE to avoid redundant resolves.
* Don't apply this optimization to FCV images as they may have other
* levels/layers with fast-cleared blocks.
*/
set_image_fast_clear_state(cmd_buffer, image, aspect,
ANV_FAST_CLEAR_NONE);
}