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

radeon: wire end_query return value to sw/hw_end

Browse source 
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
This commit is contained in:
Nicolai Hähnle 2016-04-20 09:43:09 -05:00
parent 71f33a6f69
commit b222580578
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/gallium/drivers/radeon/r600_query.c
View file

@ -113,7 +113,7 @@ static boolean r600_query_sw_begin(struct r600_common_context *rctx,
return TRUE;
}
static void r600_query_sw_end(struct r600_common_context *rctx,
static bool r600_query_sw_end(struct r600_common_context *rctx,
struct r600_query *rquery)
{
struct r600_query_sw *query = (struct r600_query_sw *)rquery;
@ -161,6 +161,8 @@ static void r600_query_sw_end(struct r600_common_context *rctx,
default:
unreachable("r600_query_sw_end: bad query type");
}
return true;
}
static boolean r600_query_sw_get_result(struct r600_common_context *rctx,
@ -730,12 +732,11 @@ static bool r600_end_query(struct pipe_context *ctx, struct pipe_query *query)
struct r600_common_context *rctx = (struct r600_common_context *)ctx;
struct r600_query *rquery = (struct r600_query *)query;
rquery->ops->end(rctx, rquery);
return true;
return rquery->ops->end(rctx, rquery);
}
void r600_query_hw_end(struct r600_common_context *rctx,
struct r600_query *rquery)
bool r600_query_hw_end(struct r600_common_context *rctx,
struct r600_query *rquery)
{
struct r600_query_hw *query = (struct r600_query_hw *)rquery;
@ -746,6 +747,8 @@ void r600_query_hw_end(struct r600_common_context *rctx,
if (!(query->flags & R600_QUERY_HW_FLAG_NO_START))
LIST_DELINIT(&query->list);
return true;
}
static unsigned r600_query_read_result(void *map, unsigned start_index, unsigned end_index,

4
src/gallium/drivers/radeon/r600_query.h
View file

@ -72,7 +72,7 @@ enum {
struct r600_query_ops {
void (*destroy)(struct r600_common_context *, struct r600_query *);
boolean (*begin)(struct r600_common_context *, struct r600_query *);
void (*end)(struct r600_common_context *, struct r600_query *);
bool (*end)(struct r600_common_context *, struct r600_query *);
boolean (*get_result)(struct r600_common_context *,
struct r600_query *, boolean wait,
union pipe_query_result *result);
@ -142,7 +142,7 @@ void r600_query_hw_destroy(struct r600_common_context *rctx,
struct r600_query *rquery);
boolean r600_query_hw_begin(struct r600_common_context *rctx,
struct r600_query *rquery);
void r600_query_hw_end(struct r600_common_context *rctx,
bool r600_query_hw_end(struct r600_common_context *rctx,
struct r600_query *rquery);
boolean r600_query_hw_get_result(struct r600_common_context *rctx,
struct r600_query *rquery,