summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/nv50/nv50_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/nv50/nv50_query.c
parent102ed41ae6287f9f43708d10f3952c3c5b887c45 (diff)
gallium: adapt to get_query_result interface change
Reviewed-by: Brian Paul <[email protected]>
Diffstat (limited to 'src/gallium/drivers/nv50/nv50_query.c')
-rw-r--r--src/gallium/drivers/nv50/nv50_query.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gallium/drivers/nv50/nv50_query.c b/src/gallium/drivers/nv50/nv50_query.c
index 2dce94a4775..59d315aa475 100644
--- a/src/gallium/drivers/nv50/nv50_query.c
+++ b/src/gallium/drivers/nv50/nv50_query.c
@@ -243,11 +243,11 @@ nv50_query_wait(struct nv50_query *q)
static boolean
nv50_query_result(struct pipe_context *pipe, struct pipe_query *pq,
- boolean wait, void *result)
+ boolean wait, union pipe_query_result *result)
{
struct nv50_query *q = nv50_query(pq);
- uint64_t *res64 = result;
- boolean *res8 = result;
+ uint64_t *res64 = (uint64_t*)result;
+ boolean *res8 = (boolean*)result;
uint64_t *data64 = (uint64_t *)q->data;
if (q->type == PIPE_QUERY_GPU_FINISHED) {