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

zink: handle null query results

Browse source 
it's possible that a query may have no results at all, so shortcut
everything and return zero as fast as possible for those cases

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21534>
This commit is contained in:
Mike Blumenkrantz 2023-02-22 16:27:40 -05:00 • committed by Marge Bot
parent 6bcf4721dc
commit cf60c7fbfa
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/gallium/drivers/zink/zink_query.c
View file

@ -657,6 +657,9 @@ get_query_result(struct pipe_context *pctx,
util_query_clear_result(result, query->type);
int num_starts = get_num_starts(query);
/* no results: return zero */
if (!num_starts)
return true;
int result_size = get_num_results(query) * sizeof(uint64_t);
int num_maps = get_num_queries(query);
@ -1299,8 +1302,14 @@ zink_get_query_result_resource(struct pipe_context *pctx,
unsigned result_size = result_type <= PIPE_QUERY_TYPE_U32 ? sizeof(uint32_t) : sizeof(uint64_t);
VkQueryResultFlagBits size_flags = result_type <= PIPE_QUERY_TYPE_U32 ? 0 : VK_QUERY_RESULT_64_BIT;
unsigned num_queries = get_num_starts(query);
struct zink_query_start *start = util_dynarray_top_ptr(&query->starts, struct zink_query_start);
unsigned query_id = start->vkq[0]->query_id;
/* it's possible that a query may have no data at all: write out zeroes to the buffer and return */
uint64_t u64[4] = {0};
unsigned src_offset = result_size * get_num_results(query);
if (!num_queries) {
tc_buffer_write(pctx, pres, offset, result_size, (unsigned char*)u64 + src_offset);
return;
}
if (index == -1) {
/* VK_QUERY_RESULT_WITH_AVAILABILITY_BIT will ALWAYS write some kind of result data
@ -1312,9 +1321,9 @@ zink_get_query_result_resource(struct pipe_context *pctx,
*/
VkQueryResultFlags flag = is_time_query(query) ? 0 : VK_QUERY_RESULT_PARTIAL_BIT;
unsigned src_offset = result_size * get_num_results(query);
if (zink_batch_usage_check_completion(ctx, query->batch_uses)) {
uint64_t u64[4] = {0};
struct zink_query_start *start = util_dynarray_top_ptr(&query->starts, struct zink_query_start);
unsigned query_id = start->vkq[0]->query_id;
VkResult result = VKCTX(GetQueryPoolResults)(screen->dev, start->vkq[0]->pool->query_pool, query_id, 1,
sizeof(u64), u64, 0, size_flags | VK_QUERY_RESULT_WITH_AVAILABILITY_BIT | flag);
if (result == VK_SUCCESS) {