OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

etnaviv: change begin_query(..) to a void function

Browse Source 
We always return true.

Signed-off-by: Christian Gmeiner <christian.gmeiner@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4456>
This commit is contained in:
Christian Gmeiner
2020-04-05 21:33:26 +02:00
committed by Marge Bot
parent 7a9cbb2b61
commit 7cb98e02e4
4 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/gallium/drivers/etnaviv/etnaviv_query.c
View File

@@ -60,15 +60,14 @@ static bool
etna_begin_query(struct pipe_context *pctx, struct pipe_query *pq) etna_begin_query(struct pipe_context *pctx, struct pipe_query *pq)
{ {
struct etna_query *q = etna_query(pq); struct etna_query *q = etna_query(pq);
bool ret;
if (q->active) if (q->active)
return false; return false;
ret = q->funcs->begin_query(etna_context(pctx), q); q->funcs->begin_query(etna_context(pctx), q);
q->active = ret; q->active = true;
return ret; return true;
} }
static bool static bool

2
src/gallium/drivers/etnaviv/etnaviv_query.h
View File

@@ -35,7 +35,7 @@ struct etna_query;
struct etna_query_funcs { struct etna_query_funcs {
void (*destroy_query)(struct etna_context *ctx, struct etna_query *q); void (*destroy_query)(struct etna_context *ctx, struct etna_query *q);
bool (*begin_query)(struct etna_context *ctx, struct etna_query *q); void (*begin_query)(struct etna_context *ctx, struct etna_query *q);
void (*end_query)(struct etna_context *ctx, struct etna_query *q); void (*end_query)(struct etna_context *ctx, struct etna_query *q);
bool (*get_query_result)(struct etna_context *ctx, struct etna_query *q, bool (*get_query_result)(struct etna_context *ctx, struct etna_query *q,
bool wait, union pipe_query_result *result); bool wait, union pipe_query_result *result);

4
src/gallium/drivers/etnaviv/etnaviv_query_acc.c
View File

@@ -78,7 +78,7 @@ realloc_query_bo(struct etna_context *ctx, struct etna_acc_query *aq)
etna_bo_cpu_fini(rsc->bo); etna_bo_cpu_fini(rsc->bo);
} }
static bool static void
etna_acc_begin_query(struct etna_context *ctx, struct etna_query *q) etna_acc_begin_query(struct etna_context *ctx, struct etna_query *q)
{ {
struct etna_acc_query *aq = etna_acc_query(q); struct etna_acc_query *aq = etna_acc_query(q);
@@ -93,8 +93,6 @@ etna_acc_begin_query(struct etna_context *ctx, struct etna_query *q)
/* add to active list */ /* add to active list */
assert(list_is_empty(&aq->node)); assert(list_is_empty(&aq->node));
list_addtail(&aq->node, &ctx->active_acc_queries); list_addtail(&aq->node, &ctx->active_acc_queries);
return true;
} }
static void static void

4
src/gallium/drivers/etnaviv/etnaviv_query_sw.c
View File

@@ -56,14 +56,12 @@ read_counter(struct etna_context *ctx, unsigned type)
return 0; return 0;
} }
static bool static void
etna_sw_begin_query(struct etna_context *ctx, struct etna_query *q) etna_sw_begin_query(struct etna_context *ctx, struct etna_query *q)
{ {
struct etna_sw_query *sq = etna_sw_query(q); struct etna_sw_query *sq = etna_sw_query(q);
sq->begin_value = read_counter(ctx, q->type); sq->begin_value = read_counter(ctx, q->type);
return true;
} }
static void static void