summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakob Bornecrantz <jakob@vmware.com>2009-03-11 14:27:54 +0100
committerJakob Bornecrantz <jakob@vmware.com>2009-03-11 14:43:28 +0100
commitb6b198ea1b52601d2b9acc210ed9a8727b59146a (patch)
treea2821efc84d9ac745e67c6adf1c65d5116f069d3
parentb6c7db8debaba2446de62efbabb2efb5b374cc5b (diff)
trace: Fixup trace a bit
-rw-r--r--src/gallium/drivers/trace/tr_screen.c25
1 files changed, 18 insertions, 7 deletions
diff --git a/src/gallium/drivers/trace/tr_screen.c b/src/gallium/drivers/trace/tr_screen.c
index 1d868eff6b..a49ddb5e9e 100644
--- a/src/gallium/drivers/trace/tr_screen.c
+++ b/src/gallium/drivers/trace/tr_screen.c
@@ -436,14 +436,26 @@ trace_screen_create(struct pipe_screen *screen)
if(!trace_dump_trace_begin())
goto error1;
+ trace_dump_call_begin("", "pipe_screen_create");
+ trace_dump_arg_begin("screen");
+ trace_dump_ptr(screen);
+ trace_dump_arg_end();
+ trace_dump_arg_begin("screen->winsys");
+ trace_dump_ptr(screen->winsys);
+ trace_dump_arg_end();
+
tr_scr = CALLOC_STRUCT(trace_screen);
if(!tr_scr)
goto error2;
+#if 0
winsys = trace_winsys_create(screen->winsys);
if(!winsys)
goto error3;
-
+#else
+ winsys = screen->winsys;
+#endif
+
tr_scr->base.winsys = winsys;
tr_scr->base.destroy = trace_screen_destroy;
tr_scr->base.get_name = trace_screen_get_name;
@@ -460,21 +472,20 @@ trace_screen_create(struct pipe_screen *screen)
tr_scr->base.tex_transfer_destroy = trace_screen_tex_transfer_destroy;
tr_scr->base.transfer_map = trace_screen_transfer_map;
tr_scr->base.transfer_unmap = trace_screen_transfer_unmap;
-
tr_scr->screen = screen;
- trace_dump_call_begin("", "pipe_screen_create");
- trace_dump_arg_begin("winsys");
- trace_dump_ptr(screen->winsys);
- trace_dump_arg_end();
- trace_dump_ret(ptr, screen);
+ trace_dump_ret(ptr, &tr_scr->base);
trace_dump_call_end();
return &tr_scr->base;
+#if 0
error3:
FREE(tr_scr);
+#endif
error2:
+ trace_dump_ret(ptr, screen);
+ trace_dump_call_end();
trace_dump_trace_end();
error1:
return screen;