summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosé Fonseca <jrfonseca@tungstengraphics.com>2008-08-09 11:54:35 +0100
committerJosé Fonseca <jrfonseca@tungstengraphics.com>2008-08-09 14:10:25 +0100
commit5549d35db5323829702099af6e53a8dd7c451524 (patch)
tree72778c0980427eb7d752d5ee19dcf2eabcd44a9b
parent376f2cbb190389807c8ba6df401e06743ead9eb8 (diff)
trace: Dump writes to pipe_buffers.
-rw-r--r--src/gallium/drivers/trace/tr_winsys.c54
-rw-r--r--src/gallium/drivers/trace/tr_winsys.h3
2 files changed, 56 insertions, 1 deletions
diff --git a/src/gallium/drivers/trace/tr_winsys.c b/src/gallium/drivers/trace/tr_winsys.c
index f1ef7cbebb..964da5677b 100644
--- a/src/gallium/drivers/trace/tr_winsys.c
+++ b/src/gallium/drivers/trace/tr_winsys.c
@@ -26,6 +26,7 @@
**************************************************************************/
#include "pipe/p_util.h"
+#include "util/u_hash_table.h"
#include "tr_stream.h"
#include "tr_dump.h"
@@ -33,6 +34,18 @@
#include "tr_winsys.h"
+static unsigned trace_buffer_hash(void *buffer)
+{
+ return (unsigned)(uintptr_t)buffer;
+}
+
+
+static int trace_buffer_compare(void *buffer1, void *buffer2)
+{
+ return (char *)buffer2 - (char *)buffer1;
+}
+
+
static const char *
trace_winsys_get_name(struct pipe_winsys *_winsys)
{
@@ -232,6 +245,13 @@ trace_winsys_buffer_map(struct pipe_winsys *_winsys,
trace_dump_call_end(stream);
+ if(result) {
+ if(usage & PIPE_BUFFER_USAGE_CPU_WRITE) {
+ assert(!hash_table_get(tr_ws->buffer_maps, buffer));
+ hash_table_set(tr_ws->buffer_maps, buffer, result);
+ }
+ }
+
return result;
}
@@ -243,6 +263,30 @@ trace_winsys_buffer_unmap(struct pipe_winsys *_winsys,
struct trace_winsys *tr_ws = trace_winsys(_winsys);
struct trace_stream *stream = tr_ws->stream;
struct pipe_winsys *winsys = tr_ws->winsys;
+ const void *map;
+
+ map = hash_table_get(tr_ws->buffer_maps, buffer);
+ if(map) {
+ trace_dump_call_begin(stream, "", "memcpy");
+
+ trace_dump_arg_begin(stream, "dst");
+ trace_dump_ptr(stream, map);
+ trace_dump_arg_end(stream);
+
+ trace_dump_arg_begin(stream, "src");
+ trace_dump_bytes(stream, map, buffer->size);
+ trace_dump_arg_end(stream);
+
+ trace_dump_arg_begin(stream, "size");
+ trace_dump_uint(stream, buffer->size);
+ trace_dump_arg_end(stream);
+
+ trace_dump_call_end(stream);
+
+ winsys->buffer_unmap(winsys, buffer);
+
+ hash_table_remove(tr_ws->buffer_maps, buffer);
+ }
trace_dump_call_begin(stream, "pipe_winsys", "buffer_unmap");
@@ -365,6 +409,8 @@ trace_winsys_destroy(struct pipe_winsys *_winsys)
trace_dump_trace_end(stream);
+ hash_table_destroy(tr_ws->buffer_maps);
+
trace_stream_close(tr_ws->stream);
FREE(tr_ws);
@@ -399,11 +445,17 @@ trace_winsys_create(struct pipe_winsys *winsys)
tr_ws->base.fence_finish = trace_winsys_fence_finish;
tr_ws->winsys = winsys;
-
+
tr_ws->stream = trace_stream_create("gallium", "trace");
if(!tr_ws->stream)
return NULL;
+ tr_ws->buffer_maps = hash_table_create(trace_buffer_hash,
+ trace_buffer_compare);
+ if(!tr_ws->buffer_maps)
+ return NULL;
+
+
trace_dump_trace_begin(tr_ws->stream, 0);
return &tr_ws->base;
diff --git a/src/gallium/drivers/trace/tr_winsys.h b/src/gallium/drivers/trace/tr_winsys.h
index 353b0ea7b6..a3576da867 100644
--- a/src/gallium/drivers/trace/tr_winsys.h
+++ b/src/gallium/drivers/trace/tr_winsys.h
@@ -34,6 +34,7 @@
#include "pipe/p_winsys.h"
+struct hash_table;
struct trace_stream;
@@ -44,6 +45,8 @@ struct trace_winsys
struct pipe_winsys *winsys;
struct trace_stream *stream;
+
+ struct hash_table *buffer_maps;
};