summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJosé Fonseca <jrfonseca@tungstengraphics.com>2008-08-14 14:38:58 +0100
committerJosé Fonseca <jrfonseca@tungstengraphics.com>2008-08-15 10:35:18 +0100
commit4fffc9d63f117cfc5d5b2400536e8757c786cc1e (patch)
treef13a64be02316c8fbc55fb3201ff3a8db0b7a2d2 /src
parent37336b7d9e7f8bed8765e9d8e4f61f804e4d8107 (diff)
trace: Several fixes.
Diffstat (limited to 'src')
-rw-r--r--src/gallium/drivers/trace/tr_context.c8
-rw-r--r--src/gallium/drivers/trace/tr_winsys.c16
2 files changed, 15 insertions, 9 deletions
diff --git a/src/gallium/drivers/trace/tr_context.c b/src/gallium/drivers/trace/tr_context.c
index 868b4f010d..e81cab252c 100644
--- a/src/gallium/drivers/trace/tr_context.c
+++ b/src/gallium/drivers/trace/tr_context.c
@@ -318,11 +318,11 @@ trace_context_create_sampler_state(struct pipe_context *_pipe,
trace_dump_call_begin("pipe_context", "create_sampler_state");
trace_dump_arg(ptr, pipe);
- trace_dump_arg(ptr, state);
+ trace_dump_arg(sampler_state, state);
result = pipe->create_sampler_state(pipe, state);;
- trace_dump_ret(sampler_state, result);
+ trace_dump_ret(ptr, result);
trace_dump_call_end();
@@ -888,10 +888,12 @@ trace_context_flush(struct pipe_context *_pipe,
trace_dump_arg(ptr, pipe);
trace_dump_arg(uint, flags);
- trace_dump_arg(ptr, fence);
pipe->flush(pipe, flags, fence);;
+ if(fence)
+ trace_dump_ret(ptr, *fence);
+
trace_dump_call_end();
}
diff --git a/src/gallium/drivers/trace/tr_winsys.c b/src/gallium/drivers/trace/tr_winsys.c
index be76c0716f..356579809a 100644
--- a/src/gallium/drivers/trace/tr_winsys.c
+++ b/src/gallium/drivers/trace/tr_winsys.c
@@ -74,12 +74,14 @@ trace_winsys_flush_frontbuffer(struct pipe_winsys *_winsys,
{
struct trace_winsys *tr_ws = trace_winsys(_winsys);
struct pipe_winsys *winsys = tr_ws->winsys;
-
+
trace_dump_call_begin("pipe_winsys", "flush_frontbuffer");
trace_dump_arg(ptr, winsys);
trace_dump_arg(ptr, surface);
+ /* XXX: hide, as there is nothing we can do with this
trace_dump_arg(ptr, context_private);
+ */
winsys->flush_frontbuffer(winsys, surface, context_private);
@@ -203,8 +205,8 @@ trace_winsys_buffer_create(struct pipe_winsys *_winsys,
static struct pipe_buffer *
trace_winsys_user_buffer_create(struct pipe_winsys *_winsys,
- void *ptr,
- unsigned bytes)
+ void *data,
+ unsigned size)
{
struct trace_winsys *tr_ws = trace_winsys(_winsys);
struct pipe_winsys *winsys = tr_ws->winsys;
@@ -213,10 +215,12 @@ trace_winsys_user_buffer_create(struct pipe_winsys *_winsys,
trace_dump_call_begin("pipe_winsys", "user_buffer_create");
trace_dump_arg(ptr, winsys);
- trace_dump_arg(ptr, ptr);
- trace_dump_arg(uint, bytes);
+ trace_dump_arg_begin("data");
+ trace_dump_bytes(data, size);
+ trace_dump_arg_end();
+ trace_dump_arg(uint, size);
- result = winsys->user_buffer_create(winsys, ptr, bytes);
+ result = winsys->user_buffer_create(winsys, data, size);
trace_dump_ret(ptr, result);