From: Marek Olšák Date: Tue, 9 Aug 2016 21:37:04 +0000 (+0200) Subject: gallium/radeon: use unflushed fences for PIPE_QUERY_GPU_FINISHED X-Git-Tag: upstream/17.1.0~7319 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3de8ffe836ceee0d49dd6199df721633612528b6;p=platform%2Fupstream%2Fmesa.git gallium/radeon: use unflushed fences for PIPE_QUERY_GPU_FINISHED Reviewed-by: Nicolai Hähnle --- diff --git a/src/gallium/drivers/radeon/r600_query.c b/src/gallium/drivers/radeon/r600_query.c index 592cec1..5825e8b 100644 --- a/src/gallium/drivers/radeon/r600_query.c +++ b/src/gallium/drivers/radeon/r600_query.c @@ -139,7 +139,7 @@ static bool r600_query_sw_end(struct r600_common_context *rctx, case PIPE_QUERY_TIMESTAMP_DISJOINT: break; case PIPE_QUERY_GPU_FINISHED: - rctx->b.flush(&rctx->b, &query->fence, 0); + rctx->b.flush(&rctx->b, &query->fence, PIPE_FLUSH_DEFERRED); break; case R600_QUERY_DRAW_CALLS: query->end_result = rctx->num_draw_calls; @@ -215,7 +215,7 @@ static bool r600_query_sw_get_result(struct r600_common_context *rctx, return true; case PIPE_QUERY_GPU_FINISHED: { struct pipe_screen *screen = rctx->b.screen; - result->b = screen->fence_finish(screen, NULL, query->fence, + result->b = screen->fence_finish(screen, &rctx->b, query->fence, wait ? PIPE_TIMEOUT_INFINITE : 0); return result->b; }