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

anv: Fix Vulkan CTS failure related to MCS (xe2)

Browse source 
Fixes: Vulkan CTS
dEQP-VK.pipeline.monolithic.multisample.sampled_image.79x31_1.r32_uint.samples_2

src/intel/vulkan/anv_private.h:5439: anv_image_get_fast_clear_type_addr: Assertion
`device->info->ver < 20' failed.

deqp-vk: ../src/intel/vulkan/genX_cmd_buffer.c:1263: transition_color_buffer:
Assertion `must_init_fast_clear_state' failed.

Signed-off-by: Jianxun Zhang <jianxun.zhang@intel.com>
Reviewed-by: Nanley Chery <nanley.g.chery@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29966>
This commit is contained in:
Jianxun Zhang 2024-06-26 23:30:35 -07:00 • committed by Marge Bot
parent beb0ea2469
commit 4034539c00
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1171,9 +1171,11 @@ transition_color_buffer(struct anv_cmd_buffer *cmd_buffer,
if (initial_layout_undefined) {
/* The subresource may have been aliased and populated with arbitrary
* data.
* data, so we should initialize fast-clear state on platforms prior to
* Xe2. Xe2+ platforms don't need it thanks to the new design of fast-
* clear.
*/
must_init_fast_clear_state = true;
must_init_fast_clear_state = devinfo->ver < 20;
if (image->planes[plane].aux_usage == ISL_AUX_USAGE_MCS ||
devinfo->has_illegal_ccs_values) {
@ -1254,7 +1256,7 @@ transition_color_buffer(struct anv_cmd_buffer *cmd_buffer,
}
if (must_init_aux_surface) {
assert(must_init_fast_clear_state);
assert(devinfo->ver >= 20 || must_init_fast_clear_state);
/* Initialize the aux buffers to enable correct rendering. In order to
* ensure that things such as storage images work correctly, aux buffers
@ -5039,10 +5041,11 @@ void genX(CmdBeginRendering)(
clear_view_mask &= ~1u;
base_clear_layer++;
clear_layer_count--;
#if GFX_VER < 20
genX(set_fast_clear_state)(cmd_buffer, iview->image,
iview->planes[0].isl.format,
clear_color);
#endif
}
if (is_multiview) {