Squashed commit of the following:

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

diff --git a/src/gallium/drivers/trace/tr_texture.h b/src/gallium/drivers/trace/tr_texture.h
index 168cefd53d6157054d3d1e3d9167af66e3fbc034..6513995d505213a8ae879cedb44874f5790f4e2b 100644 (file)
--- a/src/gallium/drivers/trace/tr_texture.h
+++ b/src/gallium/drivers/trace/tr_texture.h
@@ -34,12 +34,15 @@
 
 #include "tr_screen.h"
 
+struct trace_context;
 
-struct trace_texture
+struct trace_resource
 {
-   struct pipe_texture base;
+   struct pipe_resource base;
 
-   struct pipe_texture *texture;
+   struct pipe_resource *resource;
+
+   struct tr_list list;
 };
 
 
@@ -48,6 +51,16 @@ struct trace_surface
    struct pipe_surface base;
 
    struct pipe_surface *surface;
+
+   struct tr_list list;
+};
+
+
+struct trace_sampler_view
+{
+   struct pipe_sampler_view base;
+
+   struct pipe_sampler_view *sampler_view;
 };
 
 
@@ -56,67 +69,76 @@ struct trace_transfer
    struct pipe_transfer base;
 
    struct pipe_transfer *transfer;
-   
+   struct pipe_context *pipe;
+
+   struct tr_list list;
+
    void *map;
 };
 
 
-static INLINE struct trace_texture *
-trace_texture(struct trace_screen *tr_scr, 
-              struct pipe_texture *texture)
+static INLINE struct trace_resource *
+trace_resource(struct pipe_resource *texture)
 {
    if(!texture)
       return NULL;
-   assert(texture->screen == &tr_scr->base);
-   return (struct trace_texture *)texture;
+   (void)trace_screen(texture->screen);
+   return (struct trace_resource *)texture;
 }
 
 
 static INLINE struct trace_surface *
-trace_surface(struct trace_texture *tr_tex, 
-              struct pipe_surface *surface)
+trace_surface(struct pipe_surface *surface)
 {
    if(!surface)
       return NULL;
-   assert(surface->texture == &tr_tex->base);
+   (void)trace_resource(surface->texture);
    return (struct trace_surface *)surface;
 }
 
 
+static INLINE struct trace_sampler_view *
+trace_sampler_view(struct pipe_sampler_view *sampler_view)
+{
+   if (!sampler_view)
+      return NULL;
+   return (struct trace_sampler_view *)sampler_view;
+}
+
+
 static INLINE struct trace_transfer *
-trace_transfer(struct trace_texture *tr_tex, 
-               struct pipe_transfer *transfer)
+trace_transfer(struct pipe_transfer *transfer)
 {
    if(!transfer)
       return NULL;
-   assert(transfer->texture == &tr_tex->base);
+   (void)trace_resource(transfer->resource);
    return (struct trace_transfer *)transfer;
 }
 
 
-struct pipe_texture *
-trace_texture_create(struct trace_screen *tr_scr, 
-                     struct pipe_texture *texture);
+struct pipe_resource *
+trace_resource_create(struct trace_screen *tr_scr,
+                     struct pipe_resource *texture);
 
 void
-trace_texture_destroy(struct trace_screen *tr_scr, 
-                      struct pipe_texture *texture);
+trace_resource_destroy(struct trace_screen *tr_scr,
+                      struct trace_resource *tr_tex);
 
 struct pipe_surface *
-trace_surface_create(struct trace_texture *tr_tex, 
+trace_surface_create(struct trace_resource *tr_tex,
                      struct pipe_surface *surface);
 
 void
-trace_surface_destroy(struct trace_texture *tr_tex,
-                      struct pipe_surface *surface);
+trace_surface_destroy(struct trace_surface *tr_surf);
 
 struct pipe_transfer *
-trace_transfer_create(struct trace_texture *tr_tex, 
-                      struct pipe_transfer *transfer);
+trace_transfer_create(struct trace_context *tr_ctx,
+                     struct trace_resource *tr_tex,
+                     struct pipe_transfer *transfer);
 
 void
-trace_transfer_destroy(struct trace_texture *tr_tex,
-                       struct pipe_transfer *transfer);
+trace_transfer_destroy(struct trace_context *tr_ctx,
+                       struct trace_transfer *tr_trans);
 
 
 #endif /* TR_TEXTURE_H_ */