diff options
author | Marek Olšák <[email protected]> | 2012-03-27 22:42:30 +0200 |
---|---|---|
committer | Marek Olšák <[email protected]> | 2012-03-30 17:12:51 +0200 |
commit | 4445e170bee23a3607ece0e010adef7058ac6a11 (patch) | |
tree | ce86b5413bc465bbbdb221b4b96bfcfd9e4ad385 /src/gallium/drivers/nvc0 | |
parent | 102ed41ae6287f9f43708d10f3952c3c5b887c45 (diff) |
gallium: adapt to get_query_result interface change
Reviewed-by: Brian Paul <[email protected]>
Diffstat (limited to 'src/gallium/drivers/nvc0')
-rw-r--r-- | src/gallium/drivers/nvc0/nvc0_push.c | 2 | ||||
-rw-r--r-- | src/gallium/drivers/nvc0/nvc0_query.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/gallium/drivers/nvc0/nvc0_push.c b/src/gallium/drivers/nvc0/nvc0_push.c index 412186c2345..cea58b447a2 100644 --- a/src/gallium/drivers/nvc0/nvc0_push.c +++ b/src/gallium/drivers/nvc0/nvc0_push.c @@ -344,7 +344,7 @@ nvc0_push_vbo(struct nvc0_context *nvc0, const struct pipe_draw_info *info) struct pipe_context *pipe = &nvc0->base.pipe; struct nvc0_so_target *targ; targ = nvc0_so_target(info->count_from_stream_output); - pipe->get_query_result(pipe, targ->pq, TRUE, &vert_count); + pipe->get_query_result(pipe, targ->pq, TRUE, (void*)&vert_count); vert_count /= targ->stride; } } diff --git a/src/gallium/drivers/nvc0/nvc0_query.c b/src/gallium/drivers/nvc0/nvc0_query.c index 7244d838f7d..699d582fe3d 100644 --- a/src/gallium/drivers/nvc0/nvc0_query.c +++ b/src/gallium/drivers/nvc0/nvc0_query.c @@ -338,12 +338,12 @@ nvc0_query_wait(struct nvc0_query *q) static boolean nvc0_query_result(struct pipe_context *pipe, struct pipe_query *pq, - boolean wait, void *result) + boolean wait, union pipe_query_result *result) { struct nvc0_query *q = nvc0_query(pq); - uint64_t *res64 = result; - uint32_t *res32 = result; - boolean *res8 = result; + uint64_t *res64 = (uint64_t*)result; + uint32_t *res32 = (uint32_t*)result; + boolean *res8 = (boolean*)result; uint64_t *data64 = (uint64_t *)q->data; unsigned i; |