Mesa (master): r600g: Fix Clang return-type build error.
Vinson Lee
vlee at kemper.freedesktop.org
Wed May 6 19:22:22 UTC 2015
Module: Mesa
Branch: master
Commit: 382b1a36e33c2d1f985996ecea54bdda547587d7
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=382b1a36e33c2d1f985996ecea54bdda547587d7
Author: Vinson Lee <vlee at freedesktop.org>
Date: Wed May 6 10:09:38 2015 -0700
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 <vlee at freedesktop.org>
Reviewed-by: Tom Stellard <thomas.stellard at amd.com>
---
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;
More information about the mesa-commit
mailing list