diff options
| author | Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl> | 2021-05-14 13:57:11 +0200 |
|---|---|---|
| committer | Eric Engestrom <eric@engestrom.ch> | 2021-06-16 08:40:20 +0200 |
| commit | bd6bc1165a99a30258982247d3d325db69af209e (patch) | |
| tree | 3b71c8ed208b590bf09c99821c05cb6322d0d049 | |
| parent | 869a31931330c1149b6bc2463b909a30faf1ee19 (diff) | |
radv: Don't skip barriers that only change queues.
We depend on the queue mask for some decisions ...
CC: mesa-stable
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10802>
(cherry picked from commit f7c622307da7179adc879b4af9bc10217922997b)
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | src/amd/vulkan/radv_cmd_buffer.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/.pick_status.json b/.pick_status.json index b556d655286..427a257156a 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1588,7 +1588,7 @@ "description": "radv: Don't skip barriers that only change queues.", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c index d12166d5456..7ad9fd625a0 100644 --- a/src/amd/vulkan/radv_cmd_buffer.c +++ b/src/amd/vulkan/radv_cmd_buffer.c @@ -6259,14 +6259,14 @@ radv_handle_image_transition(struct radv_cmd_buffer *cmd_buffer, struct radv_ima return; } - if (src_layout == dst_layout && src_render_loop == dst_render_loop) - return; - unsigned src_queue_mask = radv_image_queue_family_mask(image, src_family, cmd_buffer->queue_family_index); unsigned dst_queue_mask = radv_image_queue_family_mask(image, dst_family, cmd_buffer->queue_family_index); + if (src_layout == dst_layout && src_render_loop == dst_render_loop && src_queue_mask == dst_queue_mask) + return; + if (vk_format_has_depth(image->vk_format)) { radv_handle_depth_image_transition(cmd_buffer, image, src_layout, src_render_loop, dst_layout, dst_render_loop, src_queue_mask, dst_queue_mask, range, |