Merge branch 'mesa_7_5_branch'

[mesa.git] / src / gallium / drivers / trace / tr_context.h

diff --git a/src/gallium/drivers/trace/tr_context.h b/src/gallium/drivers/trace/tr_context.h
index 75b8d11a7acbd1597be7ffe936cc04ca5046ecfc..6febe4b41143b9a0cc78d7a74bc864a9ce4e71f4 100644 (file)
--- a/src/gallium/drivers/trace/tr_context.h
+++ b/src/gallium/drivers/trace/tr_context.h
@@ -30,29 +30,79 @@
 
 
 #include "pipe/p_compiler.h"
-#include "pipe/p_debug.h"
+#include "util/u_debug.h"
 #include "pipe/p_context.h"
 
+#include "tr_screen.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 
 struct trace_context
 {
    struct pipe_context base;
-   
-   /* TODO */
+
+   struct pipe_context *pipe;
+
+   /* current state */
+   struct {
+      struct trace_shader *fs;
+      struct trace_shader *vs;
+
+      struct trace_texture *tex[PIPE_MAX_SAMPLERS];
+      unsigned num_texs;
+
+      unsigned nr_cbufs;
+      struct trace_texture *cbufs[PIPE_MAX_COLOR_BUFS];
+      struct trace_texture *zsbuf;
+   } curr;
+
+   struct {
+      struct trace_shader *fs;
+      struct trace_shader *vs;
+
+      struct trace_texture *tex;
+      struct trace_texture *surf;
+
+      int blocker;
+   } draw_rule;
+   unsigned draw_num_rules;
+   pipe_condvar draw_cond;
+   pipe_mutex draw_mutex;
+   int draw_blocker;
+   int draw_blocked;
+
+   /* for list on screen */
+   struct tr_list list;
+
+   /* list of state objects */
+   pipe_mutex list_mutex;
+   unsigned num_shaders;
+   struct tr_list shaders;
 };
 
 
 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_screen *screen,
+                     struct pipe_context *pipe);
 
+void
+trace_rbug_notify_draw_blocked(struct trace_context *tr_ctx);
+
+
+#ifdef __cplusplus
+}
+#endif
 
 #endif /* TR_CONTEXT_H_ */