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

panfrost: allocate bo for occlusion query results

Browse source 
This memory needs to still be available after all the drawing is done
and forgotten about, so cannot be transient.
Also clear the result so that no rendering returns a zero.

Signed-off-by: Urja Rannikko <urjaman@gmail.com>
Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
This commit is contained in:
Urja Rannikko 2019-10-22 12:05:07 +00:00
parent 728a975700
commit dff99ce7d5
2 changed files with 25 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -931,7 +931,7 @@ panfrost_emit_for_draw(struct panfrost_context *ctx, bool with_vertex_data)
if (ctx->occlusion_query) {
ctx->payloads[PIPE_SHADER_FRAGMENT].gl_enables |= MALI_OCCLUSION_QUERY | MALI_OCCLUSION_PRECISE;
ctx->payloads[PIPE_SHADER_FRAGMENT].postfix.occlusion_counter = ctx->occlusion_query->transfer.gpu;
ctx->payloads[PIPE_SHADER_FRAGMENT].postfix.occlusion_counter = ctx->occlusion_query->bo->gpu;
}
panfrost_patch_shader_state_compute(ctx, PIPE_SHADER_VERTEX, true);
@ -2451,6 +2451,13 @@ panfrost_create_query(struct pipe_context *pipe,
static void
panfrost_destroy_query(struct pipe_context *pipe, struct pipe_query *q)
{
struct panfrost_query *query = (struct panfrost_query *) q;
if (query->bo) {
panfrost_bo_unreference(query->bo);
query->bo = NULL;
}
ralloc_free(q);
}
@ -2459,14 +2466,20 @@ panfrost_begin_query(struct pipe_context *pipe, struct pipe_query *q)
{
struct panfrost_context *ctx = pan_context(pipe);
struct panfrost_query *query = (struct panfrost_query *) q;
struct panfrost_batch *batch = panfrost_get_batch_for_fbo(ctx);
switch (query->type) {
case PIPE_QUERY_OCCLUSION_COUNTER:
case PIPE_QUERY_OCCLUSION_PREDICATE:
case PIPE_QUERY_OCCLUSION_PREDICATE_CONSERVATIVE:
/* Allocate a word for the query results to be stored */
query->transfer = panfrost_allocate_transient(batch, sizeof(unsigned));
/* Allocate a bo for the query results to be stored */
if (!query->bo) {
query->bo = panfrost_bo_create(
pan_screen(ctx->base.screen),
sizeof(unsigned), 0);
}
unsigned *result = (unsigned *)query->bo->cpu;
*result = 0; /* Default to 0 if nothing at all drawn. */
ctx->occlusion_query = query;
break;
@ -2529,7 +2542,7 @@ panfrost_get_query_result(struct pipe_context *pipe,
panfrost_flush_all_batches(ctx, true);
/* Read back the query results */
unsigned *result = (unsigned *) query->transfer.cpu;
unsigned *result = (unsigned *) query->bo->cpu;
unsigned passed = *result;
if (query->type == PIPE_QUERY_OCCLUSION_COUNTER) {

16
src/gallium/drivers/panfrost/pan_context.h
View file

@ -80,16 +80,14 @@ struct panfrost_query {
unsigned type;
unsigned index;
union {
/* For computed queries. 64-bit to prevent overflow */
struct {
uint64_t start;
uint64_t end;
};
/* Memory for the GPU to writeback the value of the query */
struct panfrost_transfer transfer;
/* For computed queries. 64-bit to prevent overflow */
struct {
uint64_t start;
uint64_t end;
};
/* Memory for the GPU to writeback the value of the query */
struct panfrost_bo *bo;
};
struct panfrost_fence {