#include "virgl_resource.h"
#include "virgl_screen.h"
-static void virgl_buffer_destroy(struct pipe_screen *screen,
- struct pipe_resource *buf)
-{
- struct virgl_screen *vs = virgl_screen(screen);
- struct virgl_buffer *vbuf = virgl_buffer(buf);
-
- util_range_destroy(&vbuf->valid_buffer_range);
- vs->vws->resource_unref(vs->vws, vbuf->base.hw_res);
- FREE(vbuf);
-}
-
static void *virgl_buffer_transfer_map(struct pipe_context *ctx,
struct pipe_resource *resource,
unsigned level,
{
struct virgl_context *vctx = virgl_context(ctx);
struct virgl_screen *vs = virgl_screen(ctx->screen);
- struct virgl_buffer *vbuf = virgl_buffer(resource);
+ struct virgl_resource *vbuf = virgl_resource(resource);
struct virgl_transfer *trans;
void *ptr;
bool readback;
- uint32_t offset;
bool doflushwait = false;
- if ((usage & PIPE_TRANSFER_READ) && (vbuf->on_list == TRUE))
+ trans = virgl_resource_create_transfer(&vctx->transfer_pool, resource,
+ &vbuf->metadata, level, usage, box);
+ if (usage & PIPE_TRANSFER_READ)
doflushwait = true;
else
- doflushwait = virgl_res_needs_flush_wait(vctx, &vbuf->base, usage);
+ doflushwait = virgl_res_needs_flush_wait(vctx, trans);
if (doflushwait)
ctx->flush(ctx, NULL, 0);
- trans = slab_alloc(&vctx->texture_transfer_pool);
- if (!trans)
- return NULL;
-
- trans->base.resource = resource;
- trans->base.level = level;
- trans->base.usage = usage;
- trans->base.box = *box;
- trans->base.stride = 0;
- trans->base.layer_stride = 0;
-
- offset = box->x;
-
- readback = virgl_res_needs_readback(vctx, &vbuf->base, usage);
+ readback = virgl_res_needs_readback(vctx, vbuf, usage, 0);
if (readback)
- vs->vws->transfer_get(vs->vws, vbuf->base.hw_res, box, offset, level);
+ vs->vws->transfer_get(vs->vws, vbuf->hw_res, box, trans->base.stride,
+ trans->l_stride, trans->offset, level);
if (!(usage & PIPE_TRANSFER_UNSYNCHRONIZED))
doflushwait = true;
if (doflushwait || readback)
- vs->vws->resource_wait(vs->vws, vbuf->base.hw_res);
+ vs->vws->resource_wait(vs->vws, vbuf->hw_res);
- ptr = vs->vws->resource_map(vs->vws, vbuf->base.hw_res);
+ ptr = vs->vws->resource_map(vs->vws, vbuf->hw_res);
if (!ptr) {
+ virgl_resource_destroy_transfer(&vctx->transfer_pool, trans);
return NULL;
}
- trans->offset = offset;
*transfer = &trans->base;
-
return ptr + trans->offset;
}
{
struct virgl_context *vctx = virgl_context(ctx);
struct virgl_transfer *trans = virgl_transfer(transfer);
- struct virgl_buffer *vbuf = virgl_buffer(transfer->resource);
+ struct virgl_resource *vbuf = virgl_resource(transfer->resource);
if (trans->base.usage & PIPE_TRANSFER_WRITE) {
- if (!(transfer->usage & PIPE_TRANSFER_FLUSH_EXPLICIT)) {
- struct virgl_screen *vs = virgl_screen(ctx->screen);
- vbuf->base.clean = FALSE;
- vctx->num_transfers++;
- vs->vws->transfer_put(vs->vws, vbuf->base.hw_res,
- &transfer->box, trans->offset, transfer->level);
-
+ struct virgl_screen *vs = virgl_screen(ctx->screen);
+ if (transfer->usage & PIPE_TRANSFER_FLUSH_EXPLICIT) {
+ if (trans->range.end <= trans->range.start) {
+ virgl_resource_destroy_transfer(&vctx->transfer_pool, trans);
+ return;
+ }
+
+ transfer->box.x += trans->range.start;
+ transfer->box.width = trans->range.end - trans->range.start;
+ trans->offset = transfer->box.x;
}
- }
- slab_free(&vctx->texture_transfer_pool, trans);
+ vctx->num_transfers++;
+ virgl_transfer_queue_unmap(&vctx->queue, trans);
+ }
}
static void virgl_buffer_transfer_flush_region(struct pipe_context *ctx,
const struct pipe_box *box)
{
struct virgl_context *vctx = virgl_context(ctx);
- struct virgl_buffer *vbuf = virgl_buffer(transfer->resource);
-
- if (!vbuf->on_list) {
- struct pipe_resource *res = NULL;
-
- list_addtail(&vbuf->flush_list, &vctx->to_flush_bufs);
- vbuf->on_list = TRUE;
- pipe_resource_reference(&res, &vbuf->base.u.b);
- }
-
- util_range_add(&vbuf->valid_buffer_range, transfer->box.x + box->x,
- transfer->box.x + box->x + box->width);
+ struct virgl_resource *vbuf = virgl_resource(transfer->resource);
+ struct virgl_transfer *trans = virgl_transfer(transfer);
- vbuf->base.clean = FALSE;
+ /*
+ * FIXME: This is not optimal. For example,
+ *
+ * glMapBufferRange(.., 0, 100, GL_MAP_FLUSH_EXPLICIT_BIT)
+ * glFlushMappedBufferRange(.., 25, 30)
+ * glFlushMappedBufferRange(.., 65, 70)
+ *
+ * We'll end up flushing 25 --> 70.
+ */
+ util_range_add(&trans->range, box->x, box->x + box->width);
}
static const struct u_resource_vtbl virgl_buffer_vtbl =
{
u_default_resource_get_handle, /* get_handle */
- virgl_buffer_destroy, /* resource_destroy */
+ virgl_resource_destroy, /* resource_destroy */
virgl_buffer_transfer_map, /* transfer_map */
virgl_buffer_transfer_flush_region, /* transfer_flush_region */
virgl_buffer_transfer_unmap, /* transfer_unmap */
};
-struct pipe_resource *virgl_buffer_create(struct virgl_screen *vs,
- const struct pipe_resource *template)
+void virgl_buffer_init(struct virgl_resource *res)
{
- struct virgl_buffer *buf;
- uint32_t size;
- uint32_t vbind;
- buf = CALLOC_STRUCT(virgl_buffer);
- buf->base.clean = TRUE;
- buf->base.u.b = *template;
- buf->base.u.b.screen = &vs->base;
- buf->base.u.vtbl = &virgl_buffer_vtbl;
- pipe_reference_init(&buf->base.u.b.reference, 1);
- util_range_init(&buf->valid_buffer_range);
-
- vbind = pipe_to_virgl_bind(template->bind);
- size = template->width0;
-
- buf->base.hw_res = vs->vws->resource_create(vs->vws, template->target, template->format, vbind, template->width0, 1, 1, 1, 0, 0, size);
-
- util_range_set_empty(&buf->valid_buffer_range);
- return &buf->base.u.b;
+ res->u.vtbl = &virgl_buffer_vtbl;
}
projects / mesa.git / blobdiff