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

vulkan: fix merging bind sparse submits together

Browse source 
Looks like this was completely broken because what we want is to merge
first/second binds to the merged object.

This fixes new CTS dEQP-VK.sparse_resources.image_sparse_binding.*.

Fixes: bba6bf33a8 ("vulkan/queue: Merge submits when possible")
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31545>
This commit is contained in:
Samuel Pitoiset 2024-10-07 08:35:55 -04:00 • committed by Marge Bot
parent e46dffddb1
commit 5bd825a4b8
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/vulkan/runtime/vk_queue.c
View file

@ -537,23 +537,23 @@ vk_queue_submits_merge(struct vk_queue *queue,
typed_memcpy(&merged->signals[first->signal_count], second->signals, second->signal_count);
for (uint32_t i = 0; i < first->buffer_bind_count; i++)
vk_queue_submit_add_buffer_bind(queue, first, &first->buffer_binds[i]);
vk_queue_submit_add_buffer_bind(queue, merged, &first->buffer_binds[i]);
for (uint32_t i = 0; i < second->buffer_bind_count; i++)
vk_queue_submit_add_buffer_bind(queue, second, &first->buffer_binds[i]);
vk_queue_submit_add_buffer_bind(queue, merged, &second->buffer_binds[i]);
for (uint32_t i = 0; i < first->image_opaque_bind_count; i++) {
vk_queue_submit_add_image_opaque_bind(queue, first,
vk_queue_submit_add_image_opaque_bind(queue, merged,
&first->image_opaque_binds[i]);
}
for (uint32_t i = 0; i < second->image_opaque_bind_count; i++) {
vk_queue_submit_add_image_opaque_bind(queue, second,
&first->image_opaque_binds[i]);
vk_queue_submit_add_image_opaque_bind(queue, merged,
&second->image_opaque_binds[i]);
}
for (uint32_t i = 0; i < first->image_bind_count; i++)
vk_queue_submit_add_image_bind(queue, first, &first->image_binds[i]);
vk_queue_submit_add_image_bind(queue, merged, &first->image_binds[i]);
for (uint32_t i = 0; i < second->image_bind_count; i++)
vk_queue_submit_add_image_bind(queue, second, &first->image_binds[i]);
vk_queue_submit_add_image_bind(queue, merged, &second->image_binds[i]);
merged->perf_pass_index = first->perf_pass_index;
assert(second->perf_pass_index == merged->perf_pass_index);