trace: Trace pipe context calls.

3 files changed, 1027 insertions, 7 deletions

diff --git a/src/gallium/drivers/trace/tr_context.c b/src/gallium/drivers/trace/tr_context.c
index 67a67b3da6..6161e35fa5 100644
--- a/src/gallium/drivers/trace/tr_context.c
+++ b/src/gallium/drivers/trace/tr_context.c
@@ -30,12 +30,1025 @@
 #include "tr_stream.h"
 #include "tr_dump.h"
 #include "tr_state.h"
+#include "tr_screen.h"
 #include "tr_context.h"
 
 
+static INLINE void
+trace_context_set_edgeflags(struct pipe_context *_pipe,
+                            const unsigned *bitfield)
+{
+   struct trace_context *tr_ctx = trace_context(_pipe);
+   struct trace_screen *tr_scr = trace_screen(_pipe->screen);
+   struct trace_stream *stream = tr_scr->stream;
+   struct pipe_context *pipe = tr_ctx->pipe;
+
+   trace_dump_call_begin(stream, "pipe_context", "set_edgeflags");
+   
+   trace_dump_arg(stream, ptr, pipe);
+   /* FIXME: we don't know how big this array is */
+   trace_dump_arg(stream, ptr, bitfield);
+
+   pipe->set_edgeflags(pipe, bitfield);;
+
+   trace_dump_call_end(stream);
+}
+
+
+static INLINE boolean
+trace_context_draw_arrays(struct pipe_context *_pipe,
+                          unsigned mode, unsigned start, unsigned count)
+{
+   struct trace_context *tr_ctx = trace_context(_pipe);
+   struct trace_screen *tr_scr = trace_screen(_pipe->screen);
+   struct trace_stream *stream = tr_scr->stream;
+   struct pipe_context *pipe = tr_ctx->pipe;
+   boolean result;
+
+   trace_dump_call_begin(stream, "pipe_context", "draw_arrays");
+
+   trace_dump_arg(stream, ptr, pipe);
+   trace_dump_arg(stream, uint, mode);
+   trace_dump_arg(stream, uint, start);
+   trace_dump_arg(stream, uint, count);
+
+   result = pipe->draw_arrays(pipe, mode, start, count);;
+
+   trace_dump_ret(stream, bool, result);
+   
+   trace_dump_call_end(stream);
+   
+   return result;
+}
+
+
+static INLINE boolean
+trace_context_draw_elements(struct pipe_context *_pipe,
+                          struct pipe_buffer *indexBuffer,
+                          unsigned indexSize,
+                          unsigned mode, unsigned start, unsigned count)
+{
+   struct trace_context *tr_ctx = trace_context(_pipe);
+   struct trace_screen *tr_scr = trace_screen(_pipe->screen);
+   struct trace_stream *stream = tr_scr->stream;
+   struct pipe_context *pipe = tr_ctx->pipe;
+   boolean result;
+
+   trace_dump_call_begin(stream, "pipe_context", "draw_elements");
+
+   trace_dump_arg(stream, ptr, pipe);
+   trace_dump_arg(stream, ptr, indexBuffer);
+   trace_dump_arg(stream, uint, indexSize);
+   trace_dump_arg(stream, uint, mode);
+   trace_dump_arg(stream, uint, start);
+   trace_dump_arg(stream, uint, count);
+
+   result = pipe->draw_elements(pipe, indexBuffer, indexSize, mode, start, count);;
+
+   trace_dump_ret(stream, bool, result);
+   
+   trace_dump_call_end(stream);
+   
+   return result;
+}
+
+
+static INLINE boolean
+trace_context_draw_range_elements(struct pipe_context *_pipe,
+                                  struct pipe_buffer *indexBuffer,
+                                  unsigned indexSize,
+                                  unsigned minIndex,
+                                  unsigned maxIndex,
+                                  unsigned mode, 
+                                  unsigned start, 
+                                  unsigned count)
+{
+   struct trace_context *tr_ctx = trace_context(_pipe);
+   struct trace_screen *tr_scr = trace_screen(_pipe->screen);
+   struct trace_stream *stream = tr_scr->stream;
+   struct pipe_context *pipe = tr_ctx->pipe;
+   boolean result;
+
+   trace_dump_call_begin(stream, "pipe_context", "draw_range_elements");
+
+   trace_dump_arg(stream, ptr, pipe);
+   trace_dump_arg(stream, ptr, indexBuffer);
+   trace_dump_arg(stream, uint, indexSize);
+   trace_dump_arg(stream, uint, minIndex);
+   trace_dump_arg(stream, uint, maxIndex);
+   trace_dump_arg(stream, uint, mode);
+   trace_dump_arg(stream, uint, start);
+   trace_dump_arg(stream, uint, count);
+
+   result = pipe->draw_range_elements(pipe, 
+                                      indexBuffer, 
+                                      indexSize, minIndex, maxIndex, 
+                                      mode, start, count);
+   
+   trace_dump_ret(stream, bool, result);
+   
+   trace_dump_call_end(stream);
+   
+   return result;
+}
+
+
+static INLINE struct pipe_query *
+trace_context_create_query(struct pipe_context *_pipe,
+                           unsigned query_type)
+{
+   struct trace_context *tr_ctx = trace_context(_pipe);
+   struct trace_screen *tr_scr = trace_screen(_pipe->screen);
+   struct trace_stream *stream = tr_scr->stream;
+   struct pipe_context *pipe = tr_ctx->pipe;
+   struct pipe_query *result;
+
+   trace_dump_call_begin(stream, "pipe_context", "create_query");
+
+   trace_dump_arg(stream, ptr, pipe);
+   trace_dump_arg(stream, uint, query_type);
+
+   result = pipe->create_query(pipe, query_type);;
+
+   trace_dump_ret(stream, ptr, result);
+   
+   trace_dump_call_end(stream);
+   
+   return result;
+}
+
+
+static INLINE void
+trace_context_destroy_query(struct pipe_context *_pipe,
+                            struct pipe_query *query)
+{
+   struct trace_context *tr_ctx = trace_context(_pipe);
+   struct trace_screen *tr_scr = trace_screen(_pipe->screen);
+   struct trace_stream *stream = tr_scr->stream;
+   struct pipe_context *pipe = tr_ctx->pipe;
+
+   trace_dump_call_begin(stream, "pipe_context", "destroy_query");
+
+   trace_dump_arg(stream, ptr, pipe);
+   trace_dump_arg(stream, ptr, query);
+
+   pipe->destroy_query(pipe, query);;
+
+   trace_dump_call_end(stream);
+}
+
+
+static INLINE void
+trace_context_begin_query(struct pipe_context *_pipe, 
+                          struct pipe_query *query)
+{
+   struct trace_context *tr_ctx = trace_context(_pipe);
+   struct trace_screen *tr_scr = trace_screen(_pipe->screen);
+   struct trace_stream *stream = tr_scr->stream;
+   struct pipe_context *pipe = tr_ctx->pipe;
+
+   trace_dump_call_begin(stream, "pipe_context", "begin_query");
+
+   trace_dump_arg(stream, ptr, pipe);
+   trace_dump_arg(stream, ptr, query);
+
+   pipe->begin_query(pipe, query);;
+
+   trace_dump_call_end(stream);
+}
+
+
+static INLINE void
+trace_context_end_query(struct pipe_context *_pipe, 
+                        struct pipe_query *query)
+{
+   struct trace_context *tr_ctx = trace_context(_pipe);
+   struct trace_screen *tr_scr = trace_screen(_pipe->screen);
+   struct trace_stream *stream = tr_scr->stream;
+   struct pipe_context *pipe = tr_ctx->pipe;
+
+   trace_dump_call_begin(stream, "pipe_context", "end_query");
+
+   trace_dump_arg(stream, ptr, pipe);
+   trace_dump_arg(stream, ptr, query);
+
+   pipe->end_query(pipe, query);
+
+   trace_dump_call_end(stream);
+}
+
+
+static INLINE boolean
+trace_context_get_query_result(struct pipe_context *_pipe, 
+                               struct pipe_query *query,
+                               boolean wait,
+                               uint64 *presult)
+{
+   struct trace_context *tr_ctx = trace_context(_pipe);
+   struct trace_screen *tr_scr = trace_screen(_pipe->screen);
+   struct trace_stream *stream = tr_scr->stream;
+   struct pipe_context *pipe = tr_ctx->pipe;
+   uint64 result;
+   boolean _result;
+
+   trace_dump_call_begin(stream, "pipe_context", "get_query_result");
+
+   trace_dump_arg(stream, ptr, pipe);
+
+   _result = pipe->get_query_result(pipe, query, wait, presult);;
+   result = *presult;
+
+   trace_dump_arg(stream, uint, result);
+   trace_dump_ret(stream, bool, _result);
+   
+   trace_dump_call_end(stream);
+   
+   return _result;
+}
+
+
+static INLINE void *
+trace_context_create_blend_state(struct pipe_context *_pipe,
+                                 const struct pipe_blend_state *state)
+{
+   struct trace_context *tr_ctx = trace_context(_pipe);
+   struct trace_screen *tr_scr = trace_screen(_pipe->screen);
+   struct trace_stream *stream = tr_scr->stream;
+   struct pipe_context *pipe = tr_ctx->pipe;
+   void * result;
+
+   trace_dump_call_begin(stream, "pipe_context", "create_blend_state");
+
+   trace_dump_arg(stream, ptr, pipe);
+   trace_dump_arg(stream, ptr, state);
+
+   result = pipe->create_blend_state(pipe, state);;
+
+   trace_dump_call_end(stream);
+   
+   return result;
+}
+
+
+static INLINE void
+trace_context_bind_blend_state(struct pipe_context *_pipe, 
+                               void *state)
+{
+   struct trace_context *tr_ctx = trace_context(_pipe);
+   struct trace_screen *tr_scr = trace_screen(_pipe->screen);
+   struct trace_stream *stream = tr_scr->stream;
+   struct pipe_context *pipe = tr_ctx->pipe;
+
+   trace_dump_call_begin(stream, "pipe_context", "bind_blend_state");
+
+   trace_dump_arg(stream, ptr, pipe);
+   trace_dump_arg(stream, ptr, state);
+
+   pipe->bind_blend_state(pipe, state);;
+
+   trace_dump_call_end(stream);
+}
+
+
+static INLINE void
+trace_context_delete_blend_state(struct pipe_context *_pipe, 
+                                 void *state)
+{
+   struct trace_context *tr_ctx = trace_context(_pipe);
+   struct trace_screen *tr_scr = trace_screen(_pipe->screen);
+   struct trace_stream *stream = tr_scr->stream;
+   struct pipe_context *pipe = tr_ctx->pipe;
+
+   trace_dump_call_begin(stream, "pipe_context", "delete_blend_state");
+
+   trace_dump_arg(stream, ptr, pipe);
+   trace_dump_arg(stream, ptr, state);
+
+   pipe->delete_blend_state(pipe, state);;
+
+   trace_dump_call_end(stream);
+}
+
+
+static INLINE void *
+trace_context_create_sampler_state(struct pipe_context *_pipe,
+                                   const struct pipe_sampler_state *state)
+{
+   struct trace_context *tr_ctx = trace_context(_pipe);
+   struct trace_screen *tr_scr = trace_screen(_pipe->screen);
+   struct trace_stream *stream = tr_scr->stream;
+   struct pipe_context *pipe = tr_ctx->pipe;
+   void * result;
+
+   trace_dump_call_begin(stream, "pipe_context", "create_sampler_state");
+
+   trace_dump_arg(stream, ptr, pipe);
+   trace_dump_arg(stream, ptr, state);
+
+   result = pipe->create_sampler_state(pipe, state);;
+
+   trace_dump_ret(stream, ptr, result);
+   
+   trace_dump_call_end(stream);
+   
+   return result;
+}
+
+
+static INLINE void
+trace_context_bind_sampler_states(struct pipe_context *_pipe, 
+                                  unsigned num_states, void **states)
+{
+   struct trace_context *tr_ctx = trace_context(_pipe);
+   struct trace_screen *tr_scr = trace_screen(_pipe->screen);
+   struct trace_stream *stream = tr_scr->stream;
+   struct pipe_context *pipe = tr_ctx->pipe;
+
+   trace_dump_call_begin(stream, "pipe_context", "bind_sampler_states");
+
+   trace_dump_arg(stream, ptr, pipe);
+   trace_dump_arg(stream, uint, num_states);
+   trace_dump_arg_array(stream, ptr, states, num_states);
+
+   pipe->bind_sampler_states(pipe, num_states, states);;
+
+   trace_dump_call_end(stream);
+}
+
+
+static INLINE void
+trace_context_delete_sampler_state(struct pipe_context *_pipe, 
+                                   void *state)
+{
+   struct trace_context *tr_ctx = trace_context(_pipe);
+   struct trace_screen *tr_scr = trace_screen(_pipe->screen);
+   struct trace_stream *stream = tr_scr->stream;
+   struct pipe_context *pipe = tr_ctx->pipe;
+
+   trace_dump_call_begin(stream, "pipe_context", "delete_sampler_state");
+
+   trace_dump_arg(stream, ptr, pipe);
+   trace_dump_arg(stream, ptr, state);
+
+   pipe->delete_sampler_state(pipe, state);;
+
+   trace_dump_call_end(stream);
+}
+
+
+static INLINE void *
+trace_context_create_rasterizer_state(struct pipe_context *_pipe,
+                                      const struct pipe_rasterizer_state *state)
+{
+   struct trace_context *tr_ctx = trace_context(_pipe);
+   struct trace_screen *tr_scr = trace_screen(_pipe->screen);
+   struct trace_stream *stream = tr_scr->stream;
+   struct pipe_context *pipe = tr_ctx->pipe;
+   void * result;
+
+   trace_dump_call_begin(stream, "pipe_context", "create_rasterizer_state");
+
+   trace_dump_arg(stream, ptr, pipe);
+   trace_dump_arg(stream, ptr, state);
+
+   result = pipe->create_rasterizer_state(pipe, state);;
+
+   trace_dump_ret(stream, ptr, result);
+   
+   trace_dump_call_end(stream);
+   
+   return result;
+}
+
+
+static INLINE void
+trace_context_bind_rasterizer_state(struct pipe_context *_pipe, 
+                                    void *state)
+{
+   struct trace_context *tr_ctx = trace_context(_pipe);
+   struct trace_screen *tr_scr = trace_screen(_pipe->screen);
+   struct trace_stream *stream = tr_scr->stream;
+   struct pipe_context *pipe = tr_ctx->pipe;
+
+   trace_dump_call_begin(stream, "pipe_context", "bind_rasterizer_state");
+
+   trace_dump_arg(stream, ptr, pipe);
+   trace_dump_arg(stream, ptr, state);
+
+   pipe->bind_rasterizer_state(pipe, state);;
+
+   trace_dump_call_end(stream);
+}
+
+
+static INLINE void
+trace_context_delete_rasterizer_state(struct pipe_context *_pipe, 
+                                      void *state)
+{
+   struct trace_context *tr_ctx = trace_context(_pipe);
+   struct trace_screen *tr_scr = trace_screen(_pipe->screen);
+   struct trace_stream *stream = tr_scr->stream;
+   struct pipe_context *pipe = tr_ctx->pipe;
+
+   trace_dump_call_begin(stream, "pipe_context", "delete_rasterizer_state");
+
+   trace_dump_arg(stream, ptr, pipe);
+   trace_dump_arg(stream, ptr, state);
+
+   pipe->delete_rasterizer_state(pipe, state);;
+
+   trace_dump_call_end(stream);
+}
+
+
+static INLINE void *
+trace_context_create_depth_stencil_alpha_state(struct pipe_context *_pipe,
+                                               const struct pipe_depth_stencil_alpha_state *state)
+{
+   struct trace_context *tr_ctx = trace_context(_pipe);
+   struct trace_screen *tr_scr = trace_screen(_pipe->screen);
+   struct trace_stream *stream = tr_scr->stream;
+   struct pipe_context *pipe = tr_ctx->pipe;
+   void * result;
+
+   trace_dump_call_begin(stream, "pipe_context", "create_depth_stencil_alpha_state");
+
+   result = pipe->create_depth_stencil_alpha_state(pipe, state);;
+
+   trace_dump_ret(stream, ptr, result);
+   trace_dump_arg(stream, ptr, state);
+
+   trace_dump_call_end(stream);
+   
+   return result;
+}
+
+
+static INLINE void
+trace_context_bind_depth_stencil_alpha_state(struct pipe_context *_pipe, 
+                                             void *state)
+{
+   struct trace_context *tr_ctx = trace_context(_pipe);
+   struct trace_screen *tr_scr = trace_screen(_pipe->screen);
+   struct trace_stream *stream = tr_scr->stream;
+   struct pipe_context *pipe = tr_ctx->pipe;
+
+   trace_dump_call_begin(stream, "pipe_context", "bind_depth_stencil_alpha_state");
+
+   trace_dump_arg(stream, ptr, pipe);
+   trace_dump_arg(stream, ptr, state);
+
+   pipe->bind_depth_stencil_alpha_state(pipe, state);;
+
+   trace_dump_call_end(stream);
+}
+
+
+static INLINE void
+trace_context_delete_depth_stencil_alpha_state(struct pipe_context *_pipe, 
+                                               void *state)
+{
+   struct trace_context *tr_ctx = trace_context(_pipe);
+   struct trace_screen *tr_scr = trace_screen(_pipe->screen);
+   struct trace_stream *stream = tr_scr->stream;
+   struct pipe_context *pipe = tr_ctx->pipe;
+
+   trace_dump_call_begin(stream, "pipe_context", "delete_depth_stencil_alpha_state");
+
+   trace_dump_arg(stream, ptr, pipe);
+   trace_dump_arg(stream, ptr, state);
+
+   pipe->delete_depth_stencil_alpha_state(pipe, state);;
+
+   trace_dump_call_end(stream);
+}
+
+
+static INLINE void *
+trace_context_create_fs_state(struct pipe_context *_pipe,
+                              const struct pipe_shader_state *state)
+{
+   struct trace_context *tr_ctx = trace_context(_pipe);
+   struct trace_screen *tr_scr = trace_screen(_pipe->screen);
+   struct trace_stream *stream = tr_scr->stream;
+   struct pipe_context *pipe = tr_ctx->pipe;
+   void * result;
+
+   trace_dump_call_begin(stream, "pipe_context", "create_fs_state");
+
+   trace_dump_arg(stream, ptr, pipe);
+   trace_dump_arg(stream, ptr, state);
+
+   result = pipe->create_fs_state(pipe, state);;
+
+   trace_dump_ret(stream, ptr, result);
+   
+   trace_dump_call_end(stream);
+   
+   return result;
+}
+
+
+static INLINE void
+trace_context_bind_fs_state(struct pipe_context *_pipe, 
+                            void *state)
+{
+   struct trace_context *tr_ctx = trace_context(_pipe);
+   struct trace_screen *tr_scr = trace_screen(_pipe->screen);
+   struct trace_stream *stream = tr_scr->stream;
+   struct pipe_context *pipe = tr_ctx->pipe;
+
+   trace_dump_call_begin(stream, "pipe_context", "bind_fs_state");
+
+   trace_dump_arg(stream, ptr, pipe);
+   trace_dump_arg(stream, ptr, state);
+
+   pipe->bind_fs_state(pipe, state);;
+
+   trace_dump_call_end(stream);
+}
+
+
+static INLINE void
+trace_context_delete_fs_state(struct pipe_context *_pipe, 
+                              void *state)
+{
+   struct trace_context *tr_ctx = trace_context(_pipe);
+   struct trace_screen *tr_scr = trace_screen(_pipe->screen);
+   struct trace_stream *stream = tr_scr->stream;
+   struct pipe_context *pipe = tr_ctx->pipe;
+
+   trace_dump_call_begin(stream, "pipe_context", "delete_fs_state");
+
+   trace_dump_arg(stream, ptr, pipe);
+   trace_dump_arg(stream, ptr, state);
+
+   pipe->delete_fs_state(pipe, state);;
+
+   trace_dump_call_end(stream);
+}
+
+
+static INLINE void *
+trace_context_create_vs_state(struct pipe_context *_pipe,
+                              const struct pipe_shader_state *state)
+{
+   struct trace_context *tr_ctx = trace_context(_pipe);
+   struct trace_screen *tr_scr = trace_screen(_pipe->screen);
+   struct trace_stream *stream = tr_scr->stream;
+   struct pipe_context *pipe = tr_ctx->pipe;
+   void * result;
+
+   trace_dump_call_begin(stream, "pipe_context", "create_vs_state");
+
+   trace_dump_arg(stream, ptr, pipe);
+   trace_dump_arg(stream, ptr, state);
+
+   result = pipe->create_vs_state(pipe, state);;
+
+   trace_dump_ret(stream, ptr, result);
+   
+   trace_dump_call_end(stream);
+   
+   return result;
+}
+
+
+static INLINE void
+trace_context_bind_vs_state(struct pipe_context *_pipe, 
+                            void *state)
+{
+   struct trace_context *tr_ctx = trace_context(_pipe);
+   struct trace_screen *tr_scr = trace_screen(_pipe->screen);
+   struct trace_stream *stream = tr_scr->stream;
+   struct pipe_context *pipe = tr_ctx->pipe;
+
+   trace_dump_call_begin(stream, "pipe_context", "bind_vs_state");
+
+   trace_dump_arg(stream, ptr, pipe);
+   trace_dump_arg(stream, ptr, state);
+
+   pipe->bind_vs_state(pipe, state);;
+
+   trace_dump_call_end(stream);
+}
+
+
+static INLINE void
+trace_context_delete_vs_state(struct pipe_context *_pipe, 
+                              void *state)
+{
+   struct trace_context *tr_ctx = trace_context(_pipe);
+   struct trace_screen *tr_scr = trace_screen(_pipe->screen);
+   struct trace_stream *stream = tr_scr->stream;
+   struct pipe_context *pipe = tr_ctx->pipe;
+
+   trace_dump_call_begin(stream, "pipe_context", "delete_vs_state");
+
+   trace_dump_arg(stream, ptr, pipe);
+   trace_dump_arg(stream, ptr, state);
+
+   pipe->delete_vs_state(pipe, state);;
+
+   trace_dump_call_end(stream);
+}
+
+
+static INLINE void
+trace_context_set_blend_color(struct pipe_context *_pipe,
+                              const struct pipe_blend_color *state)
+{
+   struct trace_context *tr_ctx = trace_context(_pipe);
+   struct trace_screen *tr_scr = trace_screen(_pipe->screen);
+   struct trace_stream *stream = tr_scr->stream;
+   struct pipe_context *pipe = tr_ctx->pipe;
+
+   trace_dump_call_begin(stream, "pipe_context", "set_blend_color");
+
+   trace_dump_arg(stream, ptr, pipe);
+   trace_dump_arg(stream, ptr, state);
+
+   pipe->set_blend_color(pipe, state);;
+
+   trace_dump_call_end(stream);
+}
+
+
+static INLINE void
+trace_context_set_clip_state(struct pipe_context *_pipe,
+                             const struct pipe_clip_state *state)
+{
+   struct trace_context *tr_ctx = trace_context(_pipe);
+   struct trace_screen *tr_scr = trace_screen(_pipe->screen);
+   struct trace_stream *stream = tr_scr->stream;
+   struct pipe_context *pipe = tr_ctx->pipe;
+
+   trace_dump_call_begin(stream, "pipe_context", "set_clip_state");
+
+   trace_dump_arg(stream, ptr, pipe);
+   trace_dump_arg(stream, ptr, state);
+
+   pipe->set_clip_state(pipe, state);;
+
+   trace_dump_call_end(stream);
+}
+
+
+static INLINE void
+trace_context_set_constant_buffer(struct pipe_context *_pipe,
+                                  uint shader, uint index,
+                                  const struct pipe_constant_buffer *buffer)
+{
+   struct trace_context *tr_ctx = trace_context(_pipe);
+   struct trace_screen *tr_scr = trace_screen(_pipe->screen);
+   struct trace_stream *stream = tr_scr->stream;
+   struct pipe_context *pipe = tr_ctx->pipe;
+
+   trace_dump_call_begin(stream, "pipe_context", "set_constant_buffer");
+
+   trace_dump_arg(stream, ptr, pipe);
+   trace_dump_arg(stream, uint, shader);
+   trace_dump_arg(stream, uint, index);
+   trace_dump_arg(stream, ptr, buffer);
+
+   pipe->set_constant_buffer(pipe, shader, index, buffer);;
+
+   trace_dump_call_end(stream);
+}
+
+
+static INLINE void
+trace_context_set_framebuffer_state(struct pipe_context *_pipe,
+                                    const struct pipe_framebuffer_state *state)
+{
+   struct trace_context *tr_ctx = trace_context(_pipe);
+   struct trace_screen *tr_scr = trace_screen(_pipe->screen);
+   struct trace_stream *stream = tr_scr->stream;
+   struct pipe_context *pipe = tr_ctx->pipe;
+
+   trace_dump_call_begin(stream, "pipe_context", "set_framebuffer_state");
+
+   trace_dump_arg(stream, ptr, pipe);
+   trace_dump_arg(stream, ptr, state);
+
+   pipe->set_framebuffer_state(pipe, state);;
+
+   trace_dump_call_end(stream);
+}
+
+
+static INLINE void
+trace_context_set_polygon_stipple(struct pipe_context *_pipe,
+                                  const struct pipe_poly_stipple *state)
+{
+   struct trace_context *tr_ctx = trace_context(_pipe);
+   struct trace_screen *tr_scr = trace_screen(_pipe->screen);
+   struct trace_stream *stream = tr_scr->stream;
+   struct pipe_context *pipe = tr_ctx->pipe;
+
+   trace_dump_call_begin(stream, "pipe_context", "set_polygon_stipple");
+
+   trace_dump_arg(stream, ptr, pipe);
+   trace_dump_arg(stream, ptr, state);
+
+   pipe->set_polygon_stipple(pipe, state);;
+
+   trace_dump_call_end(stream);
+}
+
+
+static INLINE void
+trace_context_set_scissor_state(struct pipe_context *_pipe,
+                                const struct pipe_scissor_state *state)
+{
+   struct trace_context *tr_ctx = trace_context(_pipe);
+   struct trace_screen *tr_scr = trace_screen(_pipe->screen);
+   struct trace_stream *stream = tr_scr->stream;
+   struct pipe_context *pipe = tr_ctx->pipe;
+
+   trace_dump_call_begin(stream, "pipe_context", "set_scissor_state");
+
+   trace_dump_arg(stream, ptr, pipe);
+   trace_dump_arg(stream, ptr, state);
+
+   pipe->set_scissor_state(pipe, state);;
+
+   trace_dump_call_end(stream);
+}
+
+
+static INLINE void
+trace_context_set_viewport_state(struct pipe_context *_pipe,
+                                 const struct pipe_viewport_state *state)
+{
+   struct trace_context *tr_ctx = trace_context(_pipe);
+   struct trace_screen *tr_scr = trace_screen(_pipe->screen);
+   struct trace_stream *stream = tr_scr->stream;
+   struct pipe_context *pipe = tr_ctx->pipe;
+
+   trace_dump_call_begin(stream, "pipe_context", "set_viewport_state");
+
+   trace_dump_arg(stream, ptr, pipe);
+   trace_dump_arg(stream, ptr, state);
+
+   pipe->set_viewport_state(pipe, state);;
+
+   trace_dump_call_end(stream);
+}
+
+
+static INLINE void
+trace_context_set_sampler_textures(struct pipe_context *_pipe,
+                                   unsigned num_textures,
+                                   struct pipe_texture **textures)
+{
+   struct trace_context *tr_ctx = trace_context(_pipe);
+   struct trace_screen *tr_scr = trace_screen(_pipe->screen);
+   struct trace_stream *stream = tr_scr->stream;
+   struct pipe_context *pipe = tr_ctx->pipe;
+
+   trace_dump_call_begin(stream, "pipe_context", "set_sampler_textures");
+
+   trace_dump_arg(stream, ptr, pipe);
+   trace_dump_arg(stream, uint, num_textures);
+   trace_dump_arg_array(stream, ptr, textures, num_textures);
+
+   pipe->set_sampler_textures(pipe, num_textures, textures);;
+
+   trace_dump_call_end(stream);
+}
+
+
+static INLINE void
+trace_context_set_vertex_buffers(struct pipe_context *_pipe,
+                                 unsigned num_buffers,
+                                 const struct pipe_vertex_buffer *buffers)
+{
+   struct trace_context *tr_ctx = trace_context(_pipe);
+   struct trace_screen *tr_scr = trace_screen(_pipe->screen);
+   struct trace_stream *stream = tr_scr->stream;
+   struct pipe_context *pipe = tr_ctx->pipe;
+
+   trace_dump_call_begin(stream, "pipe_context", "set_vertex_buffers");
+
+   trace_dump_arg(stream, ptr, pipe);
+   trace_dump_arg(stream, uint, num_buffers);
+   trace_dump_arg(stream, ptr, buffers);
+   //trace_dump_arg_array(stream, ptr, buffers, num_buffers);
+
+   pipe->set_vertex_buffers(pipe, num_buffers, buffers);;
+
+   trace_dump_call_end(stream);
+}
+
+
+static INLINE void
+trace_context_set_vertex_elements(struct pipe_context *_pipe,
+                                  unsigned num_elements,
+                                  const struct pipe_vertex_element *elements)
+{
+   struct trace_context *tr_ctx = trace_context(_pipe);
+   struct trace_screen *tr_scr = trace_screen(_pipe->screen);
+   struct trace_stream *stream = tr_scr->stream;
+   struct pipe_context *pipe = tr_ctx->pipe;
+
+   trace_dump_call_begin(stream, "pipe_context", "set_vertex_elements");
+
+   trace_dump_arg(stream, ptr, pipe);
+   trace_dump_arg(stream, uint, num_elements);
+   trace_dump_arg(stream, ptr, elements);
+   //trace_dump_arg_array(stream, ptr, elements, num_elements);
+
+   pipe->set_vertex_elements(pipe, num_elements, elements);;
+
+   trace_dump_call_end(stream);
+}
+
+
+static INLINE void
+trace_context_surface_copy(struct pipe_context *_pipe,
+                           boolean do_flip,
+                           struct pipe_surface *dest,
+                           unsigned destx, unsigned desty,
+                           struct pipe_surface *src,
+                           unsigned srcx, unsigned srcy,
+                           unsigned width, unsigned height)
+{
+   struct trace_context *tr_ctx = trace_context(_pipe);
+   struct trace_screen *tr_scr = trace_screen(_pipe->screen);
+   struct trace_stream *stream = tr_scr->stream;
+   struct pipe_context *pipe = tr_ctx->pipe;
+
+   trace_dump_call_begin(stream, "pipe_context", "surface_copy");
+
+   trace_dump_arg(stream, ptr, pipe);
+   trace_dump_arg(stream, bool, do_flip);
+   trace_dump_arg(stream, ptr, dest);
+   trace_dump_arg(stream, uint, destx);
+   trace_dump_arg(stream, uint, desty);
+   trace_dump_arg(stream, ptr, src);
+   trace_dump_arg(stream, uint, srcx);
+   trace_dump_arg(stream, uint, srcy);
+   trace_dump_arg(stream, uint, width);
+   trace_dump_arg(stream, uint, height);
+
+   pipe->surface_copy(pipe, do_flip, 
+                      dest, destx, desty, 
+                      src, srcx, srcy, width, height);
+   
+   trace_dump_call_end(stream);
+}
+
+
+static INLINE void
+trace_context_surface_fill(struct pipe_context *_pipe,
+                           struct pipe_surface *dst,
+                           unsigned dstx, unsigned dsty,
+                           unsigned width, unsigned height,
+                           unsigned value)
+{
+   struct trace_context *tr_ctx = trace_context(_pipe);
+   struct trace_screen *tr_scr = trace_screen(_pipe->screen);
+   struct trace_stream *stream = tr_scr->stream;
+   struct pipe_context *pipe = tr_ctx->pipe;
+
+   trace_dump_call_begin(stream, "pipe_context", "surface_fill");
+
+   trace_dump_arg(stream, ptr, pipe);
+   trace_dump_arg(stream, ptr, dst);
+   trace_dump_arg(stream, uint, dstx);
+   trace_dump_arg(stream, uint, dsty);
+   trace_dump_arg(stream, uint, width);
+   trace_dump_arg(stream, uint, height);
+
+   pipe->surface_fill(pipe, dst, dstx, dsty, width, height, value);;
+
+   trace_dump_call_end(stream);
+}
+
+
+static INLINE void
+trace_context_clear(struct pipe_context *_pipe, 
+                    struct pipe_surface *surface,
+                    unsigned clearValue)
+{
+   struct trace_context *tr_ctx = trace_context(_pipe);
+   struct trace_screen *tr_scr = trace_screen(_pipe->screen);
+   struct trace_stream *stream = tr_scr->stream;
+   struct pipe_context *pipe = tr_ctx->pipe;
+
+   trace_dump_call_begin(stream, "pipe_context", "clear");
+
+   trace_dump_arg(stream, ptr, pipe);
+   trace_dump_arg(stream, ptr, surface);
+   trace_dump_arg(stream, uint, clearValue);
+
+   pipe->clear(pipe, surface, clearValue);;
+
+   trace_dump_call_end(stream);
+}
+
+
+static INLINE void
+trace_context_flush(struct pipe_context *_pipe,
+                    unsigned flags,
+                    struct pipe_fence_handle **fence)
+{
+   struct trace_context *tr_ctx = trace_context(_pipe);
+   struct trace_screen *tr_scr = trace_screen(_pipe->screen);
+   struct trace_stream *stream = tr_scr->stream;
+   struct pipe_context *pipe = tr_ctx->pipe;
+
+   trace_dump_call_begin(stream, "pipe_context", "flush");
+
+   trace_dump_arg(stream, ptr, pipe);
+   trace_dump_arg(stream, uint, flags);
+   trace_dump_arg(stream, ptr, fence);
+
+   pipe->flush(pipe, flags, fence);;
+
+   trace_dump_call_end(stream);
+}
+
+
+static INLINE void
+trace_context_destroy(struct pipe_context *_pipe)
+{
+   struct trace_context *tr_ctx = trace_context(_pipe);
+   struct trace_screen *tr_scr = trace_screen(_pipe->screen);
+   struct trace_stream *stream = tr_scr->stream;
+   struct pipe_context *pipe = tr_ctx->pipe;
+
+   trace_dump_call_begin(stream, "pipe_context", "destroy");
+
+   trace_dump_arg(stream, ptr, pipe);
+
+   pipe->destroy(pipe);
+   
+   trace_dump_call_end(stream);
+
+   FREE(tr_ctx);
+}
+
+
 struct pipe_context *
 trace_context_create(struct pipe_context *pipe)
 {
-   /* TODO */
-   return pipe;
+   struct trace_context *tr_ctx;
+   
+   if(!debug_get_bool_option("GALLIUM_TRACE", FALSE))
+      return pipe;
+   
+   tr_ctx = CALLOC_STRUCT(trace_context);
+   if(!tr_ctx)
+      return NULL;
+
+   tr_ctx->base.winsys = pipe->winsys;
+   tr_ctx->base.screen = pipe->screen;
+   tr_ctx->base.destroy = trace_context_destroy;
+   tr_ctx->base.set_edgeflags = trace_context_set_edgeflags;
+   tr_ctx->base.draw_arrays = trace_context_draw_arrays;
+   tr_ctx->base.draw_elements = trace_context_draw_elements;
+   tr_ctx->base.draw_range_elements = trace_context_draw_range_elements;
+   tr_ctx->base.create_query = trace_context_create_query;
+   tr_ctx->base.destroy_query = trace_context_destroy_query;
+   tr_ctx->base.begin_query = trace_context_begin_query;
+   tr_ctx->base.end_query = trace_context_end_query;
+   tr_ctx->base.get_query_result = trace_context_get_query_result;
+   tr_ctx->base.create_blend_state = trace_context_create_blend_state;
+   tr_ctx->base.bind_blend_state = trace_context_bind_blend_state;
+   tr_ctx->base.delete_blend_state = trace_context_delete_blend_state;
+   tr_ctx->base.create_sampler_state = trace_context_create_sampler_state;
+   tr_ctx->base.bind_sampler_states = trace_context_bind_sampler_states;
+   tr_ctx->base.delete_sampler_state = trace_context_delete_sampler_state;
+   tr_ctx->base.create_rasterizer_state = trace_context_create_rasterizer_state;
+   tr_ctx->base.bind_rasterizer_state = trace_context_bind_rasterizer_state;
+   tr_ctx->base.delete_rasterizer_state = trace_context_delete_rasterizer_state;
+   tr_ctx->base.create_depth_stencil_alpha_state = trace_context_create_depth_stencil_alpha_state;
+   tr_ctx->base.bind_depth_stencil_alpha_state = trace_context_bind_depth_stencil_alpha_state;
+   tr_ctx->base.delete_depth_stencil_alpha_state = trace_context_delete_depth_stencil_alpha_state;
+   tr_ctx->base.create_fs_state = trace_context_create_fs_state;
+   tr_ctx->base.bind_fs_state = trace_context_bind_fs_state;
+   tr_ctx->base.delete_fs_state = trace_context_delete_fs_state;
+   tr_ctx->base.create_vs_state = trace_context_create_vs_state;
+   tr_ctx->base.bind_vs_state = trace_context_bind_vs_state;
+   tr_ctx->base.delete_vs_state = trace_context_delete_vs_state;
+   tr_ctx->base.set_blend_color = trace_context_set_blend_color;
+   tr_ctx->base.set_clip_state = trace_context_set_clip_state;
+   tr_ctx->base.set_constant_buffer = trace_context_set_constant_buffer;
+   tr_ctx->base.set_framebuffer_state = trace_context_set_framebuffer_state;
+   tr_ctx->base.set_polygon_stipple = trace_context_set_polygon_stipple;
+   tr_ctx->base.set_scissor_state = trace_context_set_scissor_state;
+   tr_ctx->base.set_viewport_state = trace_context_set_viewport_state;
+   tr_ctx->base.set_sampler_textures = trace_context_set_sampler_textures;
+   tr_ctx->base.set_vertex_buffers = trace_context_set_vertex_buffers;
+   tr_ctx->base.set_vertex_elements = trace_context_set_vertex_elements;
+   tr_ctx->base.surface_copy = trace_context_surface_copy;
+   tr_ctx->base.surface_fill = trace_context_surface_fill;
+   tr_ctx->base.clear = trace_context_clear;
+   tr_ctx->base.flush = trace_context_flush;
+
+   tr_ctx->pipe = pipe;
+   
+   return &tr_ctx->base;
 }
diff --git a/src/gallium/drivers/trace/tr_context.h b/src/gallium/drivers/trace/tr_context.h
index 75b8d11a7a..80fb5980d6 100644
--- a/src/gallium/drivers/trace/tr_context.h
+++ b/src/gallium/drivers/trace/tr_context.h
@@ -38,21 +38,21 @@ struct trace_context
 {
    struct pipe_context base;
    
-   /* TODO */
+   struct pipe_context *pipe;
 };
 
 
 static INLINE struct trace_context *
-trace_context(struct pipe_context *context)
+trace_context(struct pipe_context *pipe)
 {
-   assert(context);
-   return (struct trace_context *)context;
+   assert(pipe);
+   return (struct trace_context *)pipe;
 }
 
 
 
 struct pipe_context *
-trace_context_create(struct pipe_context *context);
+trace_context_create(struct pipe_context *pipe);
 
 
 #endif /* TR_CONTEXT_H_ */
diff --git a/src/gallium/drivers/trace/tr_dump.h b/src/gallium/drivers/trace/tr_dump.h
index f086486591..0be0812ce8 100644
--- a/src/gallium/drivers/trace/tr_dump.h
+++ b/src/gallium/drivers/trace/tr_dump.h
@@ -91,6 +91,13 @@ void trace_dump_ptr(struct trace_stream *stream, const void *value);
       trace_dump_array_end(_stream); \
    } while(0)
 
+#define trace_dump_arg_array(_stream, _type, _arg, _size) \
+   do { \
+      trace_dump_arg_begin(_stream, #_arg); \
+      trace_dump_array(_stream, _type, _arg, _size); \
+      trace_dump_arg_end(_stream); \
+   } while(0)
+
 #define trace_dump_member(_stream, _type, _obj, _member) \
    do { \
       trace_dump_member_begin(_stream, #_member); \