X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fdrivers%2Ftrace%2Ftr_texture.h;h=e5dfc53fdb062b00729f0b98892d55541c52650c;hb=9da0cd56c3f95081bd4cc7efe87d2b475019b17d;hp=6513995d505213a8ae879cedb44874f5790f4e2b;hpb=bcc13b74443137043e8a34f8cb64a5add0d8af93;p=mesa.git

diff --git a/src/gallium/drivers/trace/tr_texture.h b/src/gallium/drivers/trace/tr_texture.h
index 6513995d505..e5dfc53fdb0 100644
--- a/src/gallium/drivers/trace/tr_texture.h
+++ b/src/gallium/drivers/trace/tr_texture.h
@@ -1,6 +1,6 @@
 /**************************************************************************
  *
- * Copyright 2008 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * Copyright 2008 VMware, Inc.
  * All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -18,7 +18,7 @@
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
- * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS BE LIABLE FOR
  * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
@@ -36,16 +36,13 @@
 
 struct trace_context;
 
-struct trace_resource
-{
-   struct pipe_resource base;
-
-   struct pipe_resource *resource;
 
-   struct tr_list list;
+struct tr_list
+{
+   struct tr_list *next;
+   struct tr_list *prev;
 };
 
-
 struct trace_surface
 {
    struct pipe_surface base;
@@ -77,27 +74,16 @@ struct trace_transfer
 };
 
 
-static INLINE struct trace_resource *
-trace_resource(struct pipe_resource *texture)
-{
-   if(!texture)
-      return NULL;
-   (void)trace_screen(texture->screen);
-   return (struct trace_resource *)texture;
-}
-
-
-static INLINE struct trace_surface *
+static inline struct trace_surface *
 trace_surface(struct pipe_surface *surface)
 {
-   if(!surface)
+   if (!surface)
       return NULL;
-   (void)trace_resource(surface->texture);
    return (struct trace_surface *)surface;
 }
 
 
-static INLINE struct trace_sampler_view *
+static inline struct trace_sampler_view *
 trace_sampler_view(struct pipe_sampler_view *sampler_view)
 {
    if (!sampler_view)
@@ -106,34 +92,26 @@ trace_sampler_view(struct pipe_sampler_view *sampler_view)
 }
 
 
-static INLINE struct trace_transfer *
+static inline struct trace_transfer *
 trace_transfer(struct pipe_transfer *transfer)
 {
-   if(!transfer)
+   if (!transfer)
       return NULL;
-   (void)trace_resource(transfer->resource);
    return (struct trace_transfer *)transfer;
 }
 
 
-struct pipe_resource *
-trace_resource_create(struct trace_screen *tr_scr,
-                     struct pipe_resource *texture);
-
-void
-trace_resource_destroy(struct trace_screen *tr_scr,
-		       struct trace_resource *tr_tex);
-
 struct pipe_surface *
-trace_surface_create(struct trace_resource *tr_tex,
-                     struct pipe_surface *surface);
+trace_surf_create(struct trace_context *tr_ctx,
+                  struct pipe_resource *tr_res,
+                  struct pipe_surface *surface);
 
 void
-trace_surface_destroy(struct trace_surface *tr_surf);
+trace_surf_destroy(struct trace_surface *tr_surf);
 
 struct pipe_transfer *
 trace_transfer_create(struct trace_context *tr_ctx,
-		      struct trace_resource *tr_tex,
+		      struct pipe_resource *tr_res,
 		      struct pipe_transfer *transfer);
 
 void