#include "util/u_inlines.h"
#include "util/u_memory.h"
#include "virgl_context.h"
+#include "virgl_encode.h"
#include "virgl_resource.h"
#include "virgl_screen.h"
-static void *virgl_buffer_transfer_map(struct pipe_context *ctx,
- struct pipe_resource *resource,
- unsigned level,
- unsigned usage,
- const struct pipe_box *box,
- struct pipe_transfer **transfer)
-{
- struct virgl_context *vctx = virgl_context(ctx);
- struct virgl_screen *vs = virgl_screen(ctx->screen);
- struct virgl_resource *vbuf = virgl_resource(resource);
- struct virgl_transfer *trans;
- void *ptr;
- bool readback;
- bool flush = false;
-
- trans = virgl_resource_create_transfer(&vctx->transfer_pool, resource,
- &vbuf->metadata, level, usage, box);
- if (usage & PIPE_TRANSFER_READ)
- flush = true;
- else
- flush = virgl_res_needs_flush(vctx, trans);
-
- if (flush)
- ctx->flush(ctx, NULL, 0);
-
- readback = virgl_res_needs_readback(vctx, vbuf, usage, 0);
- if (readback)
- vs->vws->transfer_get(vs->vws, vbuf->hw_res, box, trans->base.stride,
- trans->l_stride, trans->offset, level);
-
- if (readback || flush)
- vs->vws->resource_wait(vs->vws, vbuf->hw_res);
-
- ptr = vs->vws->resource_map(vs->vws, vbuf->hw_res);
- if (!ptr) {
- virgl_resource_destroy_transfer(&vctx->transfer_pool, trans);
- return NULL;
- }
-
- *transfer = &trans->base;
- return ptr + trans->offset;
-}
-
static void virgl_buffer_transfer_unmap(struct pipe_context *ctx,
struct pipe_transfer *transfer)
{
if (trans->base.usage & PIPE_TRANSFER_WRITE) {
if (transfer->usage & PIPE_TRANSFER_FLUSH_EXPLICIT) {
if (trans->range.end <= trans->range.start) {
- virgl_resource_destroy_transfer(&vctx->transfer_pool, trans);
+ virgl_resource_destroy_transfer(vctx, trans);
return;
}
trans->offset = transfer->box.x;
}
- virgl_transfer_queue_unmap(&vctx->queue, trans);
+ if (trans->copy_src_hw_res) {
+ virgl_encode_copy_transfer(vctx, trans);
+ virgl_resource_destroy_transfer(vctx, trans);
+ } else {
+ virgl_transfer_queue_unmap(&vctx->queue, trans);
+ }
} else
- virgl_resource_destroy_transfer(&vctx->transfer_pool, trans);
+ virgl_resource_destroy_transfer(vctx, trans);
}
static void virgl_buffer_transfer_flush_region(struct pipe_context *ctx,
*
* We'll end up flushing 25 --> 70.
*/
- util_range_add(&trans->range, box->x, box->x + box->width);
+ util_range_add(transfer->resource, &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_resource_destroy, /* resource_destroy */
- virgl_buffer_transfer_map, /* transfer_map */
+ virgl_resource_transfer_map, /* transfer_map */
virgl_buffer_transfer_flush_region, /* transfer_flush_region */
virgl_buffer_transfer_unmap, /* transfer_unmap */
};