/**************************************************************************
*
- * 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
* 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.
#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_tex;
-
- if(!texture)
- goto error;
-
- assert(texture->screen == tr_scr->screen);
-
- tr_tex = CALLOC_STRUCT(trace_resource);
- if(!tr_tex)
- goto error;
-
- memcpy(&tr_tex->base, texture, sizeof(struct pipe_resource));
-
- pipe_reference_init(&tr_tex->base.reference, 1);
- tr_tex->base.screen = &tr_scr->base;
- tr_tex->resource = texture;
-
- return &tr_tex->base;
-
-error:
- pipe_resource_reference(&texture, NULL);
- return NULL;
-}
-
-
-void
-trace_resource_destroy(struct trace_screen *tr_scr,
- struct trace_resource *tr_tex)
-{
- pipe_resource_reference(&tr_tex->resource, NULL);
- FREE(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 *res,
+ struct pipe_surface *surface)
{
struct trace_surface *tr_surf;
- if(!surface)
+ if (!surface)
goto error;
- assert(surface->texture == tr_tex->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_tex->base);
+ pipe_resource_reference(&tr_surf->base.texture, res);
tr_surf->surface = surface;
return &tr_surf->base;
void
-trace_surface_destroy(struct trace_surface *tr_surf)
+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);
struct pipe_transfer *
trace_transfer_create(struct trace_context *tr_ctx,
- struct trace_resource *tr_tex,
+ struct pipe_resource *res,
struct pipe_transfer *transfer)
{
struct trace_transfer *tr_trans;
- if(!transfer)
+ if (!transfer)
goto error;
- assert(transfer->resource == tr_tex->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));
tr_trans->base.resource = NULL;
tr_trans->transfer = transfer;
- pipe_resource_reference(&tr_trans->base.resource, &tr_tex->base);
- assert(tr_trans->base.resource == &tr_tex->base);
+ pipe_resource_reference(&tr_trans->base.resource, res);
+ assert(tr_trans->base.resource == res);
return &tr_trans->base;
error:
- tr_ctx->pipe->transfer_destroy(tr_ctx->pipe, transfer);
+ tr_ctx->pipe->transfer_unmap(tr_ctx->pipe, transfer);
return NULL;
}
trace_transfer_destroy(struct trace_context *tr_context,
struct trace_transfer *tr_trans)
{
- struct pipe_context *context = tr_context->pipe;
- struct pipe_transfer *transfer = tr_trans->transfer;
-
pipe_resource_reference(&tr_trans->base.resource, NULL);
- context->transfer_destroy(context, transfer);
FREE(tr_trans);
}