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

zink: remove explicit fencing for query results

Browse source 
now that the results are automatically being copied to internal buffers,
mapping the buffers will handle any fencing that's required

the only caveat is that the query still needs to be flushed for a result
to be returned

Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9811>
This commit is contained in:
Mike Blumenkrantz 2021-03-12 09:00:16 -05:00 • committed by Marge Bot
parent 726e2eb8f9
commit c962980725
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/gallium/drivers/zink/zink_query.c
View file

@ -479,13 +479,10 @@ force_cpu_read(struct zink_context *ctx, struct pipe_query *pquery, enum pipe_qu
unsigned result_size = result_type <= PIPE_QUERY_TYPE_U32 ? sizeof(uint32_t) : sizeof(uint64_t);
struct zink_query *query = (struct zink_query*)pquery;
union pipe_query_result result;
uint32_t batch_id = p_atomic_read(&query->batch_id.usage);
if (query->needs_update)
update_qbo(ctx, query);
zink_wait_on_batch(ctx, batch_id);
bool success = get_query_result(pctx, pquery, true, &result);
if (!success) {
debug_printf("zink: getting query result failed\n");
@ -752,13 +749,12 @@ zink_get_query_result(struct pipe_context *pctx,
{
struct zink_query *query = (void*)q;
struct zink_context *ctx = zink_context(pctx);
uint32_t batch_id = p_atomic_read(&query->batch_id.usage);
if (query->needs_update)
update_qbo(ctx, query);
if (wait)
zink_wait_on_batch(ctx, batch_id);
if (query->batch_id.usage == ctx->curr_batch)
pctx->flush(pctx, NULL, 0);
return get_query_result(pctx, q, wait, result);
}