summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/softpipe/sp_query.c
diff options
context:
space:
mode:
authorMarek Olšák <[email protected]>2012-03-27 22:42:30 +0200
committerMarek Olšák <[email protected]>2012-03-30 17:12:51 +0200
commit4445e170bee23a3607ece0e010adef7058ac6a11 (patch)
treece86b5413bc465bbbdb221b4b96bfcfd9e4ad385 /src/gallium/drivers/softpipe/sp_query.c
parent102ed41ae6287f9f43708d10f3952c3c5b887c45 (diff)
gallium: adapt to get_query_result interface change
Reviewed-by: Brian Paul <[email protected]>
Diffstat (limited to 'src/gallium/drivers/softpipe/sp_query.c')
-rw-r--r--src/gallium/drivers/softpipe/sp_query.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gallium/drivers/softpipe/sp_query.c b/src/gallium/drivers/softpipe/sp_query.c
index 2e54e023091..c173736d714 100644
--- a/src/gallium/drivers/softpipe/sp_query.c
+++ b/src/gallium/drivers/softpipe/sp_query.c
@@ -157,7 +157,7 @@ static boolean
softpipe_get_query_result(struct pipe_context *pipe,
struct pipe_query *q,
boolean wait,
- void *vresult)
+ union pipe_query_result *vresult)
{
struct softpipe_query *sq = softpipe_query(q);
uint64_t *result = (uint64_t*)vresult;
@@ -211,7 +211,8 @@ softpipe_check_render_cond(struct softpipe_context *sp)
wait = (sp->render_cond_mode == PIPE_RENDER_COND_WAIT ||
sp->render_cond_mode == PIPE_RENDER_COND_BY_REGION_WAIT);
- b = pipe->get_query_result(pipe, sp->render_cond_query, wait, &result);
+ b = pipe->get_query_result(pipe, sp->render_cond_query, wait,
+ (void*)&result);
if (b)
return result > 0;
else