trace: remove pipe_resource wrapping

Not needed. ddebug does the same thing. The limitation is that drivers
can only use pipe_resource::screen through pipe_resource_reference.

This unbreaks trace, because pipe_context uploaders aren't wrapped,
so trace doesn't understand buffers returned by them.

Reviewed-by: Brian Paul <[email protected]>

1 files changed, 7 insertions, 45 deletions

diff --git a/src/gallium/drivers/trace/tr_texture.c b/src/gallium/drivers/trace/tr_texture.c
index 47845a35a64..fe0c7b52c9b 100644
--- a/src/gallium/drivers/trace/tr_texture.c
+++ b/src/gallium/drivers/trace/tr_texture.c
@@ -35,47 +35,9 @@
 #include "tr_texture.h"
 
 
-struct pipe_resource *
-trace_resource_create(struct trace_screen *tr_scr,
-                     struct pipe_resource *texture)
-{
-   struct trace_resource *tr_res;
-
-   if (!texture)
-      goto error;
-
-   assert(texture->screen == tr_scr->screen);
-
-   tr_res = CALLOC_STRUCT(trace_resource);
-   if (!tr_res)
-      goto error;
-
-   memcpy(&tr_res->base, texture, sizeof(struct pipe_resource));
-
-   pipe_reference_init(&tr_res->base.reference, 1);
-   tr_res->base.screen = &tr_scr->base;
-   tr_res->resource = texture;
-
-   return &tr_res->base;
-
-error:
-   pipe_resource_reference(&texture, NULL);
-   return NULL;
-}
-
-
-void
-trace_resource_destroy(struct trace_screen *tr_scr,
-		       struct trace_resource *tr_res)
-{
-   pipe_resource_reference(&tr_res->resource, NULL);
-   FREE(tr_res);
-}
-
-
 struct pipe_surface *
 trace_surf_create(struct trace_context *tr_ctx,
-                  struct trace_resource *tr_res,
+                  struct pipe_resource *res,
                   struct pipe_surface *surface)
 {
    struct trace_surface *tr_surf;
@@ -83,7 +45,7 @@ trace_surf_create(struct trace_context *tr_ctx,
    if (!surface)
       goto error;
 
-   assert(surface->texture == tr_res->resource);
+   assert(surface->texture == res);
 
    tr_surf = CALLOC_STRUCT(trace_surface);
    if (!tr_surf)
@@ -94,7 +56,7 @@ trace_surf_create(struct trace_context *tr_ctx,
 
    pipe_reference_init(&tr_surf->base.reference, 1);
    tr_surf->base.texture = NULL;
-   pipe_resource_reference(&tr_surf->base.texture, &tr_res->base);
+   pipe_resource_reference(&tr_surf->base.texture, res);
    tr_surf->surface = surface;
 
    return &tr_surf->base;
@@ -117,7 +79,7 @@ trace_surf_destroy(struct trace_surface *tr_surf)
 
 struct pipe_transfer *
 trace_transfer_create(struct trace_context *tr_ctx,
-		      struct trace_resource *tr_res,
+		      struct pipe_resource *res,
 		      struct pipe_transfer *transfer)
 {
    struct trace_transfer *tr_trans;
@@ -125,7 +87,7 @@ trace_transfer_create(struct trace_context *tr_ctx,
    if (!transfer)
       goto error;
 
-   assert(transfer->resource == tr_res->resource);
+   assert(transfer->resource == res);
 
    tr_trans = CALLOC_STRUCT(trace_transfer);
    if (!tr_trans)
@@ -136,8 +98,8 @@ trace_transfer_create(struct trace_context *tr_ctx,
    tr_trans->base.resource = NULL;
    tr_trans->transfer = transfer;
 
-   pipe_resource_reference(&tr_trans->base.resource, &tr_res->base);
-   assert(tr_trans->base.resource == &tr_res->base);
+   pipe_resource_reference(&tr_trans->base.resource, res);
+   assert(tr_trans->base.resource == res);
 
    return &tr_trans->base;