Squashed commit of the following:

[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 142842324857db3b6d1b174eed8085fbcc6445c1..1b4121d80a917013afc0802b1a7c419a606f89af 100644 (file)
--- a/src/gallium/drivers/trace/tr_context.h
+++ b/src/gallium/drivers/trace/tr_context.h
@@ -53,23 +53,23 @@ struct trace_context
       struct trace_shader *fs;
       struct trace_shader *vs;
 
-      struct trace_texture *tex[PIPE_MAX_SAMPLERS];
-      unsigned num_texs;
+      struct trace_sampler_view *sampler_views[PIPE_MAX_SAMPLERS];
+      unsigned num_sampler_views;
 
-      struct trace_texture *vert_tex[PIPE_MAX_VERTEX_SAMPLERS];
-      unsigned num_vert_texs;
+      struct trace_sampler_view *vert_sampler_views[PIPE_MAX_VERTEX_SAMPLERS];
+      unsigned num_vert_sampler_views;
 
       unsigned nr_cbufs;
-      struct trace_texture *cbufs[PIPE_MAX_COLOR_BUFS];
-      struct trace_texture *zsbuf;
+      struct trace_resource *cbufs[PIPE_MAX_COLOR_BUFS];
+      struct trace_resource *zsbuf;
    } curr;
 
    struct {
       struct trace_shader *fs;
       struct trace_shader *vs;
 
-      struct trace_texture *tex;
-      struct trace_texture *surf;
+      struct trace_sampler_view *sampler_view;
+      struct trace_resource *surf;
 
       int blocker;
    } draw_rule;