summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/r300/r300_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/r300/r300_query.c
parent102ed41ae6287f9f43708d10f3952c3c5b887c45 (diff)
gallium: adapt to get_query_result interface change
Reviewed-by: Brian Paul <[email protected]>
Diffstat (limited to 'src/gallium/drivers/r300/r300_query.c')
-rw-r--r--src/gallium/drivers/r300/r300_query.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/drivers/r300/r300_query.c b/src/gallium/drivers/r300/r300_query.c
index bcf6d0eb475..829370b8dac 100644
--- a/src/gallium/drivers/r300/r300_query.c
+++ b/src/gallium/drivers/r300/r300_query.c
@@ -135,7 +135,7 @@ static void r300_end_query(struct pipe_context* pipe,
static boolean r300_get_query_result(struct pipe_context* pipe,
struct pipe_query* query,
boolean wait,
- void* vresult)
+ union pipe_query_result *vresult)
{
struct r300_context* r300 = r300_context(pipe);
struct r300_query *q = r300_query(query);
@@ -191,7 +191,7 @@ static void r300_render_condition(struct pipe_context *pipe,
wait = mode == PIPE_RENDER_COND_WAIT ||
mode == PIPE_RENDER_COND_BY_REGION_WAIT;
- if (r300_get_query_result(pipe, query, wait, &result)) {
+ if (r300_get_query_result(pipe, query, wait, (void*)&result)) {
r300->skip_rendering = result == 0;
}
}