fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 11:18:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

virgl: use virgl_transfer in inline write

Browse source 
Let's define a helper function and use it.

This commit also allows resources to be emitted into different command
buffers.

Like the ioctls, send 0 for layer_stride and stride.  If we actually
send the real values, there are various assumptions in virglrenderer
for non-1D buffers that may need to be modified.

Reviewed-by: Gert Wollny <gert.wollny@collabora.com>
This commit is contained in:
Gurchetan Singh 2018-11-28 14:44:16 -08:00 • committed by Gert Wollny
parent 0fcd48bac5
commit 503ffe46bb
1 changed files with 41 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
src/gallium/drivers/virgl/virgl_encode.c
View file

@ -49,16 +49,23 @@ static int virgl_encoder_write_cmd_dword(struct virgl_context *ctx,
return 0; return 0;
} }
static void virgl_encoder_emit_resource(struct virgl_screen *vs,
struct virgl_cmd_buf *buf,
struct virgl_resource *res)
{
struct virgl_winsys *vws = vs->vws;
if (res && res->hw_res)
vws->emit_res(vws, buf, res->hw_res, TRUE);
else {
virgl_encoder_write_dword(buf, 0);
}
}
static void virgl_encoder_write_res(struct virgl_context *ctx, static void virgl_encoder_write_res(struct virgl_context *ctx,
struct virgl_resource *res) struct virgl_resource *res)
{ {
struct virgl_winsys *vws = virgl_screen(ctx->base.screen)->vws; struct virgl_screen *vs = virgl_screen(ctx->base.screen);
virgl_encoder_emit_resource(vs, ctx->cbuf, res);
if (res && res->hw_res)
vws->emit_res(vws, ctx->cbuf, res->hw_res, TRUE);
else {
virgl_encoder_write_dword(ctx->cbuf, 0);
}
} }
int virgl_encode_bind_object(struct virgl_context *ctx, int virgl_encode_bind_object(struct virgl_context *ctx,
@ -502,23 +509,24 @@ int virgl_encoder_create_so_target(struct virgl_context *ctx,
return 0; return 0;
} }
static void virgl_encoder_iw_emit_header_1d(struct virgl_context *ctx, static void virgl_encoder_transfer3d_common(struct virgl_screen *vs,
struct virgl_resource *res, struct virgl_cmd_buf *buf,
unsigned level, unsigned usage, struct virgl_transfer *xfer)
const struct pipe_box *box,
unsigned stride, unsigned layer_stride)
{ {
virgl_encoder_write_res(ctx, res); struct pipe_transfer *transfer = &xfer->base;
virgl_encoder_write_dword(ctx->cbuf, level); struct virgl_resource *res = virgl_resource(transfer->resource);
virgl_encoder_write_dword(ctx->cbuf, usage);
virgl_encoder_write_dword(ctx->cbuf, stride); virgl_encoder_emit_resource(vs, buf, res);
virgl_encoder_write_dword(ctx->cbuf, layer_stride); virgl_encoder_write_dword(buf, transfer->level);
virgl_encoder_write_dword(ctx->cbuf, box->x); virgl_encoder_write_dword(buf, transfer->usage);
virgl_encoder_write_dword(ctx->cbuf, box->y); virgl_encoder_write_dword(buf, 0);
virgl_encoder_write_dword(ctx->cbuf, box->z); virgl_encoder_write_dword(buf, 0);
virgl_encoder_write_dword(ctx->cbuf, box->width); virgl_encoder_write_dword(buf, transfer->box.x);
virgl_encoder_write_dword(ctx->cbuf, box->height); virgl_encoder_write_dword(buf, transfer->box.y);
virgl_encoder_write_dword(ctx->cbuf, box->depth); virgl_encoder_write_dword(buf, transfer->box.z);
virgl_encoder_write_dword(buf, transfer->box.width);
virgl_encoder_write_dword(buf, transfer->box.height);
virgl_encoder_write_dword(buf, transfer->box.depth);
} }
int virgl_encoder_inline_write(struct virgl_context *ctx, int virgl_encoder_inline_write(struct virgl_context *ctx,
@ -530,7 +538,13 @@ int virgl_encoder_inline_write(struct virgl_context *ctx,
{ {
uint32_t size = (stride ? stride : box->width) * box->height; uint32_t size = (stride ? stride : box->width) * box->height;
uint32_t length, thispass, left_bytes; uint32_t length, thispass, left_bytes;
struct pipe_box mybox = *box; struct virgl_transfer transfer;
struct virgl_screen *vs = virgl_screen(ctx->base.screen);
transfer.base.resource = &res->u.b;
transfer.base.level = level;
transfer.base.usage = usage;
transfer.base.box = *box;
length = 11 + (size + 3) / 4; length = 11 + (size + 3) / 4;
if ((ctx->cbuf->cdw + length + 1) > VIRGL_MAX_CMDBUF_DWORDS) { if ((ctx->cbuf->cdw + length + 1) > VIRGL_MAX_CMDBUF_DWORDS) {
@ -549,12 +563,12 @@ int virgl_encoder_inline_write(struct virgl_context *ctx,
length = MIN2(thispass, left_bytes); length = MIN2(thispass, left_bytes);
mybox.width = length; transfer.base.box.width = length;
virgl_encoder_write_cmd_dword(ctx, VIRGL_CMD0(VIRGL_CCMD_RESOURCE_INLINE_WRITE, 0, ((length + 3) / 4) + 11)); virgl_encoder_write_cmd_dword(ctx, VIRGL_CMD0(VIRGL_CCMD_RESOURCE_INLINE_WRITE, 0, ((length + 3) / 4) + 11));
virgl_encoder_iw_emit_header_1d(ctx, res, level, usage, &mybox, stride, layer_stride); virgl_encoder_transfer3d_common(vs, ctx->cbuf, &transfer);
virgl_encoder_write_block(ctx->cbuf, data, length); virgl_encoder_write_block(ctx->cbuf, data, length);
left_bytes -= length; left_bytes -= length;
mybox.x += length; transfer.base.box.x += length;
data += length; data += length;
} }
return 0; return 0;