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

anv: fix submission batching with perf queries

Browse source 
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>
(cherry picked from commit b8e29e8936)
This commit is contained in:
Lionel Landwerlin 2021-07-28 18:44:07 +03:00 • committed by Eric Engestrom
parent 6a03a4db5b
commit f4550c6442
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -1507,7 +1507,7 @@
"description": "anv: fix submission batching with perf queries",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "0a7224f3ff7542f1560f06759dbdc375e298e853"
},

7
src/intel/vulkan/anv_queue.c
View file

@ -1220,7 +1220,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;