diff options
| author | Nicolai Hähnle <nicolai.haehnle@amd.com> | 2016-04-20 09:43:09 -0500 |
|---|---|---|
| committer | Nicolai Hähnle <nicolai.haehnle@amd.com> | 2016-04-21 22:33:07 -0500 |
| commit | b222580578ad4236f6b7fe15f50fa46b56086902 (patch) | |
| tree | 02c41ed07ca53b566716b0d5449c14b7ec8e11e9 /src/gallium/drivers/radeon/r600_query.c | |
| parent | 71f33a6f690f5c3163065787b13164da4dc6176b (diff) | |
| download | external_mesa3d-b222580578ad4236f6b7fe15f50fa46b56086902.zip external_mesa3d-b222580578ad4236f6b7fe15f50fa46b56086902.tar.gz external_mesa3d-b222580578ad4236f6b7fe15f50fa46b56086902.tar.bz2 | |
radeon: wire end_query return value to sw/hw_end
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Diffstat (limited to 'src/gallium/drivers/radeon/r600_query.c')
| -rw-r--r-- | src/gallium/drivers/radeon/r600_query.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/gallium/drivers/radeon/r600_query.c b/src/gallium/drivers/radeon/r600_query.c index e3b9de0..6e53c76 100644 --- a/src/gallium/drivers/radeon/r600_query.c +++ b/src/gallium/drivers/radeon/r600_query.c @@ -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, |