From 382b1a36e33c2d1f985996ecea54bdda547587d7 Mon Sep 17 00:00:00 2001 From: Vinson Lee Date: Wed, 6 May 2015 10:09:38 -0700 Subject: [PATCH] r600g: Fix Clang return-type build error. Fix Clang return-type error introduced with commit 96f164f6f047833091eb98a73aa80c31dc94f962 "gallium: make pipe_context::begin_query return a boolean". CC r600_query.lo r600_query.c:443:3: error: non-void function 'r600_begin_query' should return a value [-Wreturn-type] return; ^ Signed-off-by: Vinson Lee Reviewed-by: Tom Stellard --- src/gallium/drivers/radeon/r600_query.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gallium/drivers/radeon/r600_query.c b/src/gallium/drivers/radeon/r600_query.c index 28a814a..71f4a15 100644 --- a/src/gallium/drivers/radeon/r600_query.c +++ b/src/gallium/drivers/radeon/r600_query.c @@ -440,7 +440,7 @@ static boolean r600_begin_query(struct pipe_context *ctx, /* Non-GPU queries. */ switch (rquery->type) { case PIPE_QUERY_TIMESTAMP_DISJOINT: - return; + return true; case R600_QUERY_DRAW_CALLS: rquery->begin_result = rctx->num_draw_calls; return true; -- 2.7.4