#include "util/u_inlines.h"
#include "util/u_memory.h"
-#include "util/u_simple_list.h"
+#include "util/simple_list.h"
#include "tgsi/tgsi_parse.h"
{
struct rbug_resource *rb_resource;
- if(!resource)
+ if (!resource)
goto error;
assert(resource->screen == rb_screen->screen);
rb_resource = CALLOC_STRUCT(rbug_resource);
- if(!rb_resource)
+ if (!rb_resource)
goto error;
memcpy(&rb_resource->base, resource, sizeof(struct pipe_resource));
rb_resource->base.screen = &rb_screen->base;
rb_resource->resource = resource;
- rbug_screen_add_to_list(rb_screen, resources, rb_resource);
+ if (resource->target != PIPE_BUFFER)
+ rbug_screen_add_to_list(rb_screen, resources, rb_resource);
return &rb_resource->base;
rbug_resource_destroy(struct rbug_resource *rb_resource)
{
struct rbug_screen *rb_screen = rbug_screen(rb_resource->base.screen);
- rbug_screen_remove_from_list(rb_screen, resources, rb_resource);
+
+ if (rb_resource->base.target != PIPE_BUFFER)
+ rbug_screen_remove_from_list(rb_screen, resources, rb_resource);
pipe_resource_reference(&rb_resource->resource, NULL);
FREE(rb_resource);
struct pipe_surface *
-rbug_surface_create(struct rbug_resource *rb_resource,
+rbug_surface_create(struct rbug_context *rb_context,
+ struct rbug_resource *rb_resource,
struct pipe_surface *surface)
{
struct rbug_surface *rb_surface;
- if(!surface)
+ if (!surface)
goto error;
assert(surface->texture == rb_resource->resource);
rb_surface = CALLOC_STRUCT(rbug_surface);
- if(!rb_surface)
+ if (!rb_surface)
goto error;
memcpy(&rb_surface->base, surface, sizeof(struct pipe_surface));
pipe_reference_init(&rb_surface->base.reference, 1);
rb_surface->base.texture = NULL;
+ rb_surface->base.context = &rb_context->base;
+ rb_surface->surface = surface; /* we own the surface already */
pipe_resource_reference(&rb_surface->base.texture, &rb_resource->base);
- rb_surface->surface = surface;
return &rb_surface->base;
}
void
-rbug_surface_destroy(struct rbug_surface *rb_surface)
+rbug_surface_destroy(struct rbug_context *rb_context,
+ struct rbug_surface *rb_surface)
{
pipe_resource_reference(&rb_surface->base.texture, NULL);
pipe_surface_reference(&rb_surface->surface, NULL);
rb_view->base.reference.count = 1;
rb_view->base.texture = NULL;
pipe_resource_reference(&rb_view->base.texture, &rb_resource->base);
- rb_view->base.context = rb_context->pipe;
+ rb_view->base.context = &rb_context->base;
rb_view->sampler_view = view;
return &rb_view->base;
struct rbug_sampler_view *rb_view)
{
pipe_resource_reference(&rb_view->base.texture, NULL);
- rb_context->pipe->sampler_view_destroy(rb_context->pipe,
- rb_view->sampler_view);
+ pipe_sampler_view_reference(&rb_view->sampler_view, NULL);
FREE(rb_view);
}
{
struct rbug_transfer *rb_transfer;
- if(!transfer)
+ if (!transfer)
goto error;
assert(transfer->resource == rb_resource->resource);
rb_transfer = CALLOC_STRUCT(rbug_transfer);
- if(!rb_transfer)
+ if (!rb_transfer)
goto error;
memcpy(&rb_transfer->base, transfer, sizeof(struct pipe_transfer));
return &rb_transfer->base;
error:
- rb_context->pipe->transfer_destroy(rb_context->pipe, transfer);
+ rb_context->pipe->transfer_unmap(rb_context->pipe, transfer);
return NULL;
}
struct rbug_transfer *rb_transfer)
{
pipe_resource_reference(&rb_transfer->base.resource, NULL);
- rb_transfer->pipe->transfer_destroy(rb_context->pipe,
- rb_transfer->transfer);
FREE(rb_transfer);
}