anv: fix submission batching with perf queries

If we have 2 command buffers back to back, one with a query pool, one
without, we don't want to retain the second query pool value (NULL).

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Fixes: 0a7224f3ff ("anv: group as many command buffers into a single execbuf")
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12107>
This commit is contained in:
Lionel Landwerlin
2021-07-28 18:44:07 +03:00
committed by Marge Bot
parent b077301a22
commit b8e29e8936

View File

@@ -1127,7 +1127,12 @@ anv_queue_submit_add_cmd_buffer(struct anv_queue_submit *submit,
}
submit->cmd_buffers[submit->cmd_buffer_count++] = cmd_buffer;
submit->perf_query_pool = cmd_buffer->perf_query_pool;
/* Only update the perf_query_pool if there is one. We can decide to batch
* 2 command buffers if the second one doesn't use a query pool, but we
* can't drop the already chosen one.
*/
if (cmd_buffer->perf_query_pool)
submit->perf_query_pool = cmd_buffer->perf_query_pool;
submit->perf_query_pass = perf_pass;
return VK_SUCCESS;