fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-21 18:40:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

panfrost: Move occlusion query allocation to create_query

Browse source 
Also ensure to check if resource allocation failed.

Signed-off-by: Mary Guillemard <mary.guillemard@collabora.com>
Reviewed-by: Louis-Francis Ratté-Boulianne <lfrb@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30553>
This commit is contained in:
Mary Guillemard 2024-08-07 14:56:05 +02:00
parent 302127fe9d
commit dee5223262
1 changed files with 30 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/gallium/drivers/panfrost/pan_context.c
View file

@ -584,11 +584,41 @@ panfrost_destroy(struct pipe_context *pipe)
static struct pipe_query *
panfrost_create_query(struct pipe_context *pipe, unsigned type, unsigned index)
{
struct panfrost_context *ctx = pan_context(pipe);
struct panfrost_device *dev = pan_device(ctx->base.screen);
struct panfrost_query *q = rzalloc(pipe, struct panfrost_query);
q->type = type;
q->index = index;
unsigned size = 0;
switch (q->type) {
case PIPE_QUERY_OCCLUSION_COUNTER:
case PIPE_QUERY_OCCLUSION_PREDICATE:
case PIPE_QUERY_OCCLUSION_PREDICATE_CONSERVATIVE:
size = sizeof(uint64_t) * dev->core_id_range;
break;
default:
break;
}
/* Allocate a resource for the query results to be stored */
if (size > 0) {
q->rsrc =
pipe_buffer_create(ctx->base.screen, PIPE_BIND_QUERY_BUFFER, 0, size);
if (!q->rsrc) {
ralloc_free(q);
return NULL;
}
/* Default to 0 if nothing at all drawn. */
uint8_t *zeroes = alloca(size);
memset(zeroes, 0, size);
pipe_buffer_write(pipe, q->rsrc, 0, size, zeroes);
}
return (struct pipe_query *)q;
}
@ -616,12 +646,6 @@ panfrost_begin_query(struct pipe_context *pipe, struct pipe_query *q)
case PIPE_QUERY_OCCLUSION_PREDICATE_CONSERVATIVE: {
unsigned size = sizeof(uint64_t) * dev->core_id_range;
/* Allocate a resource for the query results to be stored */
if (!query->rsrc) {
query->rsrc = pipe_buffer_create(ctx->base.screen,
PIPE_BIND_QUERY_BUFFER, 0, size);
}
/* Default to 0 if nothing at all drawn. */
uint8_t *zeroes = alloca(size);
memset(zeroes, 0, size);