fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-22 04:50:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

zink: create/use query pools dynamically

Browse source 
this fits the concept of "pools are shared between queries" a bit
better and leaves the pool ownership/destruction to their users

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21534>
This commit is contained in:
Mike Blumenkrantz 2023-02-22 12:59:46 -05:00 • committed by Marge Bot
parent e56d4f9264
commit 7da78ffb69
1 changed files with 21 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -22,6 +22,7 @@ struct zink_query_pool {
VkQueryPipelineStatisticFlags pipeline_stats; VkQueryPipelineStatisticFlags pipeline_stats;
VkQueryPool query_pool; VkQueryPool query_pool;
unsigned last_range; unsigned last_range;
unsigned refcount;
bool overflow; bool overflow;
}; };
@ -55,8 +56,6 @@ struct zink_query {
struct threaded_query base; struct threaded_query base;
enum pipe_query_type type; enum pipe_query_type type;
struct zink_query_pool *pool[2];
/* Everytime the gallium query needs /* Everytime the gallium query needs
* another vulkan query, add a new start. * another vulkan query, add a new start.
*/ */
@ -390,10 +389,22 @@ fail:
} }
static void static void
unref_vk_query(struct zink_vk_query *vkq) unref_vk_pool(struct zink_screen *screen, struct zink_query_pool *pool)
{
if (!pool || --pool->refcount)
return;
VKSCR(DestroyQueryPool)(screen->dev, pool->query_pool, NULL);
if (list_is_linked(&pool->list))
list_del(&pool->list);
FREE(pool);
}
static void
unref_vk_query(struct zink_screen *screen, struct zink_vk_query *vkq)
{ {
if (!vkq) if (!vkq)
return; return;
unref_vk_pool(screen, vkq->pool);
vkq->refcount--; vkq->refcount--;
if (vkq->refcount == 0) if (vkq->refcount == 0)
FREE(vkq); FREE(vkq);
@ -409,7 +420,7 @@ destroy_query(struct zink_screen *screen, struct zink_query *query)
unsigned num_starts = query->starts.capacity / sizeof(struct zink_query_start); unsigned num_starts = query->starts.capacity / sizeof(struct zink_query_start);
for (unsigned j = 0; j < num_starts; j++) { for (unsigned j = 0; j < num_starts; j++) {
for (unsigned i = 0; i < PIPE_MAX_VERTEX_STREAMS; i++) { for (unsigned i = 0; i < PIPE_MAX_VERTEX_STREAMS; i++) {
unref_vk_query(starts[j].vkq[i]); unref_vk_query(screen, starts[j].vkq[i]);
} }
} }
@ -449,8 +460,9 @@ query_pool_get_range(struct zink_context *ctx, struct zink_query *q)
} }
start->data = 0; start->data = 0;
unsigned num_pools = get_num_query_pools(q);
for (unsigned i = 0; i < num_queries; i++) { for (unsigned i = 0; i < num_queries; i++) {
int pool_idx = q->pool[1] ? i : 0; int pool_idx = num_pools > 1 ? i : 0;
/* try and find the active query for this */ /* try and find the active query for this */
struct zink_vk_query *vkq; struct zink_vk_query *vkq;
int xfb_idx = num_queries == 4 ? i : q->index; int xfb_idx = num_queries == 4 ? i : q->index;
@ -458,8 +470,10 @@ query_pool_get_range(struct zink_context *ctx, struct zink_query *q)
(pool_idx == 1)) && ctx->curr_xfb_queries[xfb_idx]) { (pool_idx == 1)) && ctx->curr_xfb_queries[xfb_idx]) {
vkq = ctx->curr_xfb_queries[xfb_idx]; vkq = ctx->curr_xfb_queries[xfb_idx];
vkq->refcount++; vkq->refcount++;
vkq->pool->refcount++;
} else { } else {
struct zink_query_pool *pool = q->pool[pool_idx]; struct zink_query_pool *pool = find_or_allocate_qp(ctx, q, pool_idx);
pool->refcount++;
vkq = CALLOC_STRUCT(zink_vk_query); vkq = CALLOC_STRUCT(zink_vk_query);
vkq->refcount = 1; vkq->refcount = 1;
@ -474,7 +488,7 @@ query_pool_get_range(struct zink_context *ctx, struct zink_query *q)
pool->overflow = true; pool->overflow = true;
} }
} }
unref_vk_query(start->vkq[i]); unref_vk_query(zink_screen(ctx->base.screen), start->vkq[i]);
start->vkq[i] = vkq; start->vkq[i] = vkq;
} }
} }
@ -513,14 +527,6 @@ zink_create_query(struct pipe_context *pctx,
query->needs_rast_discard_workaround = true; query->needs_rast_discard_workaround = true;
} }
int num_pools = get_num_query_pools(query);
for (unsigned i = 0; i < num_pools; i++) {
query->pool[i] = find_or_allocate_qp(zink_context(pctx), query, i);
if (!query->pool[i])
goto fail;
}
if (!qbo_append(pctx->screen, query)) if (!qbo_append(pctx->screen, query))
goto fail; goto fail;
struct zink_batch *batch = &zink_context(pctx)->batch; struct zink_batch *batch = &zink_context(pctx)->batch;