summaryrefslogtreecommitdiff
path: root/src/gallium/drivers/nv30/nv30_query.c
diff options
context:
space:
mode:
authorKeith Whitwell <keithw@vmware.com>2009-01-09 10:08:06 +0000
committerKeith Whitwell <keithw@vmware.com>2009-01-09 10:08:06 +0000
commite3734593aea202e99e77febea7b86c904080939f (patch)
tree69856674e2062c55ec5eec95eb0e31225a943084 /src/gallium/drivers/nv30/nv30_query.c
parent221352bbd79a0ea92ce31cffb65537f62ee5668e (diff)
parent5cad143e545775acacee294049345c6a3868c51d (diff)
Merge commit 'origin/gallium-0.2' into gallium-xlib-rework
Conflicts: progs/glsl/Makefile
Diffstat (limited to 'src/gallium/drivers/nv30/nv30_query.c')
-rw-r--r--src/gallium/drivers/nv30/nv30_query.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/drivers/nv30/nv30_query.c b/src/gallium/drivers/nv30/nv30_query.c
index d40d75f264..2f974cf5c4 100644
--- a/src/gallium/drivers/nv30/nv30_query.c
+++ b/src/gallium/drivers/nv30/nv30_query.c
@@ -50,7 +50,7 @@ nv30_query_begin(struct pipe_context *pipe, struct pipe_query *pq)
* the existing query to notify completion, but it could be better.
*/
if (q->object) {
- uint64 tmp;
+ uint64_t tmp;
pipe->get_query_result(pipe, pq, 1, &tmp);
}
@@ -80,7 +80,7 @@ nv30_query_end(struct pipe_context *pipe, struct pipe_query *pq)
static boolean
nv30_query_result(struct pipe_context *pipe, struct pipe_query *pq,
- boolean wait, uint64 *result)
+ boolean wait, uint64_t *result)
{
struct nv30_context *nv30 = nv30_context(pipe);
struct nv30_query *q = nv30_query(pq);