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

radv: check if DCC is enabled when resolving different levels

Browse source 
Fixes an assertion triggered by new CTS:
dEQP-VK.renderpass2.suballocation.multisample_resolve.*_resolve_level_*

Looks like the driver should pass a range to radv_layout_dcc_compressed().

Cc: 21.1 mesa-stable
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10502>
(cherry picked from commit 80f55e5163)
This commit is contained in:
Samuel Pitoiset 2021-04-28 17:21:23 +02:00 • committed by Eric Engestrom
parent be5cc7cdd9
commit 7c2ee1d626
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -355,7 +355,7 @@
"description": "radv: check if DCC is enabled when resolving different levels",
"nominated": true,
"nomination_type": 0,
"resolution": 0,
"resolution": 1,
"master_sha": null,
"because_sha": null
},

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

@ -678,7 +678,8 @@ radv_meta_resolve_compute_image(struct radv_cmd_buffer *cmd_buffer, struct radv_
uint32_t queue_mask = radv_image_queue_family_mask(dest_image, cmd_buffer->queue_family_index,
cmd_buffer->queue_family_index);
if (radv_layout_dcc_compressed(cmd_buffer->device, dest_image, dest_image_layout, false,
if (radv_dcc_enabled(dest_image, region->dstSubresource.mipLevel) &&
radv_layout_dcc_compressed(cmd_buffer->device, dest_image, dest_image_layout, false,
queue_mask) &&
(region->dstOffset.x || region->dstOffset.y || region->dstOffset.z ||
region->extent.width != dest_image->info.width ||
@ -760,6 +761,7 @@ radv_meta_resolve_compute_image(struct radv_cmd_buffer *cmd_buffer, struct radv_
radv_meta_restore(&saved_state, cmd_buffer);
if (!radv_image_use_dcc_image_stores(cmd_buffer->device, dest_image) &&
radv_dcc_enabled(dest_image, region->dstSubresource.mipLevel) &&
radv_layout_dcc_compressed(cmd_buffer->device, dest_image, dest_image_layout, false,
queue_mask)) {