summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/trace
diff options
context:
space:
mode:
authorKeith Whitwell <[email protected]>2009-01-09 10:08:06 +0000
committerKeith Whitwell <[email protected]>2009-01-09 10:08:06 +0000
commite3734593aea202e99e77febea7b86c904080939f (patch)
tree69856674e2062c55ec5eec95eb0e31225a943084 /src/gallium/drivers/trace
parent221352bbd79a0ea92ce31cffb65537f62ee5668e (diff)
parent5cad143e545775acacee294049345c6a3868c51d (diff)
Merge commit 'origin/gallium-0.2' into gallium-xlib-rework
Conflicts: progs/glsl/Makefile
Diffstat (limited to 'src/gallium/drivers/trace')
-rw-r--r--src/gallium/drivers/trace/tr_context.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/drivers/trace/tr_context.c b/src/gallium/drivers/trace/tr_context.c
index 1dd77193791..f0d51ad82ef 100644
--- a/src/gallium/drivers/trace/tr_context.c
+++ b/src/gallium/drivers/trace/tr_context.c
@@ -274,11 +274,11 @@ static INLINE boolean
trace_context_get_query_result(struct pipe_context *_pipe,
struct pipe_query *query,
boolean wait,
- uint64 *presult)
+ uint64_t *presult)
{
struct trace_context *tr_ctx = trace_context(_pipe);
struct pipe_context *pipe = tr_ctx->pipe;
- uint64 result;
+ uint64_t result;
boolean _result;
trace_dump_call_begin("pipe_context", "get_query_result");