freedreno/ir3: add ctx->mem_to_mem()

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

diff --git a/src/gallium/drivers/trace/tr_texture.c b/src/gallium/drivers/trace/tr_texture.c
index 81ebc9ee770032a7a56ba749d3b0d942ace1a73e..fe0c7b52c9b925e3c99bccfcddd88e979ebc6a76 100644 (file)
--- a/src/gallium/drivers/trace/tr_texture.c
+++ b/src/gallium/drivers/trace/tr_texture.c
@@ -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.
@@ -28,71 +28,35 @@
 #include "util/u_inlines.h"
 #include "util/u_hash_table.h"
 #include "util/u_memory.h"
-#include "util/u_simple_list.h"
+#include "util/simple_list.h"
 
 #include "tr_screen.h"
 #include "tr_context.h"
 #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_resource *tr_res,
+trace_surf_create(struct trace_context *tr_ctx,
+                  struct pipe_resource *res,
                   struct pipe_surface *surface)
 {
    struct trace_surface *tr_surf;
 
-   if(!surface)
+   if (!surface)
       goto error;
 
-   assert(surface->texture == tr_res->resource);
+   assert(surface->texture == res);
 
    tr_surf = CALLOC_STRUCT(trace_surface);
-   if(!tr_surf)
+   if (!tr_surf)
       goto error;
 
    memcpy(&tr_surf->base, surface, sizeof(struct pipe_surface));
+   tr_surf->base.context = &tr_ctx->base;
 
    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;
@@ -106,6 +70,7 @@ error:
 void
 trace_surf_destroy(struct trace_surface *tr_surf)
 {
+   trace_context_check(tr_surf->base.context);
    pipe_resource_reference(&tr_surf->base.texture, NULL);
    pipe_surface_reference(&tr_surf->surface, NULL);
    FREE(tr_surf);
@@ -114,18 +79,18 @@ 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;
 
-   if(!transfer)
+   if (!transfer)
       goto error;
 
-   assert(transfer->resource == tr_res->resource);
+   assert(transfer->resource == res);
 
    tr_trans = CALLOC_STRUCT(trace_transfer);
-   if(!tr_trans)
+   if (!tr_trans)
       goto error;
 
    memcpy(&tr_trans->base, transfer, sizeof(struct pipe_transfer));
@@ -133,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;