diff options
| author | Keith Whitwell <[email protected]> | 2009-01-09 10:08:06 +0000 |
|---|---|---|
| committer | Keith Whitwell <[email protected]> | 2009-01-09 10:08:06 +0000 |
| commit | e3734593aea202e99e77febea7b86c904080939f (patch) | |
| tree | 69856674e2062c55ec5eec95eb0e31225a943084 /src/gallium/drivers/nv40 | |
| parent | 221352bbd79a0ea92ce31cffb65537f62ee5668e (diff) | |
| parent | 5cad143e545775acacee294049345c6a3868c51d (diff) | |
Merge commit 'origin/gallium-0.2' into gallium-xlib-rework
Conflicts:
progs/glsl/Makefile
Diffstat (limited to 'src/gallium/drivers/nv40')
| -rw-r--r-- | src/gallium/drivers/nv40/nv40_query.c | 4 | ||||
| -rw-r--r-- | src/gallium/drivers/nv40/nv40_state_emit.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/gallium/drivers/nv40/nv40_query.c b/src/gallium/drivers/nv40/nv40_query.c index 57f39cfab0c..9b9a43f49df 100644 --- a/src/gallium/drivers/nv40/nv40_query.c +++ b/src/gallium/drivers/nv40/nv40_query.c @@ -50,7 +50,7 @@ nv40_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 @@ nv40_query_end(struct pipe_context *pipe, struct pipe_query *pq) static boolean nv40_query_result(struct pipe_context *pipe, struct pipe_query *pq, - boolean wait, uint64 *result) + boolean wait, uint64_t *result) { struct nv40_context *nv40 = nv40_context(pipe); struct nv40_query *q = nv40_query(pq); diff --git a/src/gallium/drivers/nv40/nv40_state_emit.c b/src/gallium/drivers/nv40/nv40_state_emit.c index ab88dc416e5..52ec4c044b4 100644 --- a/src/gallium/drivers/nv40/nv40_state_emit.c +++ b/src/gallium/drivers/nv40/nv40_state_emit.c @@ -65,7 +65,7 @@ nv40_state_emit(struct nv40_context *nv40) struct nv40_state *state = &nv40->state; struct nv40_screen *screen = nv40->screen; unsigned i, samplers; - uint64 states; + uint64_t states; if (nv40->pctx_id != screen->cur_pctx) { for (i = 0; i < NV40_STATE_MAX; i++) { |