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

turnip: Fix execution of secondary cmd bufs with nothing in primary.

Browse source 
We want to finish off cmd emission in the primary CS and add its entry to
the IB, but regardless of whether there had been anything in the primary
CS to emit, we still need a reserved CS entry for the loop below.

Fixes crashes in dEQP-VK.binding_model.shader_access.secondary_cmd_buf.*
and many more in dEQP-VK.renderpass*

Reviewed-by: Jonathan Marek <jonathan@marek.ca>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3524>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3524>
This commit is contained in:
Eric Anholt 2020-01-22 13:19:32 -08:00 • committed by Marge Bot
parent d6d6ef2862
commit fbd9b4ce08
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/freedreno/vulkan/tu_cs.c
View file

@ -220,18 +220,14 @@ tu_cs_add_entries(struct tu_cs *cs, struct tu_cs *target)
assert(cs->mode == TU_CS_MODE_GROW);
assert(target->mode == TU_CS_MODE_GROW);
if (!tu_cs_is_empty(cs)) {
if (!tu_cs_is_empty(cs))
tu_cs_add_entry(cs);
result = tu_cs_reserve_entry(cs);
if (result != VK_SUCCESS)
return result;
}
for (unsigned i = 0; i < target->entry_count; i++) {
cs->entries[cs->entry_count++] = target->entries[i];
result = tu_cs_reserve_entry(cs);
if (result != VK_SUCCESS)
return result;
cs->entries[cs->entry_count++] = target->entries[i];
}
return VK_SUCCESS;