Merge branch 'mesa_7_7_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 0c2bf276895efc2fa3ccb059ace49aafd09a3ee5..852b480765a03deb12402d543af51ff18ab6943c 100644 (file)
--- a/src/gallium/drivers/trace/tr_context.h
+++ b/src/gallium/drivers/trace/tr_context.h
@@ -51,11 +51,27 @@ struct trace_context
       struct trace_shader *fs;
       struct trace_shader *vs;
 
+      struct trace_texture *tex[PIPE_MAX_SAMPLERS];
+      unsigned num_texs;
+
+      struct trace_texture *vert_tex[PIPE_MAX_VERTEX_SAMPLERS];
+      unsigned num_vert_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;