david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qxl: add support for chunked cursors.

Browse Source 
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Message-id: 20170828123933.30323-3-kraxel@redhat.com
This commit is contained in:
Gerd Hoffmann 2017-08-28 14:39:33 +02:00
parent 79c5a10cdd
commit b21330b513
1 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
hw/display/qxl-render.c
View File

@ -204,7 +204,33 @@ void qxl_render_update_area_done(PCIQXLDevice *qxl, QXLCookie *cookie)
g_free(cookie); g_free(cookie);
} }
static QEMUCursor *qxl_cursor(PCIQXLDevice *qxl, QXLCursor *cursor) static void qxl_unpack_chunks(void *dest, size_t size, PCIQXLDevice *qxl,
QXLDataChunk *chunk, uint32_t group_id)
{
uint32_t max_chunks = 32;
size_t offset = 0;
size_t bytes;
for (;;) {
bytes = MIN(size - offset, chunk->data_size);
memcpy(dest + offset, chunk->data, bytes);
offset += bytes;
if (offset == size) {
return;
}
chunk = qxl_phys2virt(qxl, chunk->next_chunk, group_id);
if (!chunk) {
return;
}
max_chunks--;
if (max_chunks == 0) {
return;
}
}
}
static QEMUCursor *qxl_cursor(PCIQXLDevice *qxl, QXLCursor *cursor,
uint32_t group_id)
{ {
QEMUCursor *c; QEMUCursor *c;
size_t size; size_t size;
@ -215,7 +241,7 @@ static QEMUCursor *qxl_cursor(PCIQXLDevice *qxl, QXLCursor *cursor)
switch (cursor->header.type) { switch (cursor->header.type) {
case SPICE_CURSOR_TYPE_ALPHA: case SPICE_CURSOR_TYPE_ALPHA:
size = sizeof(uint32_t) * cursor->header.width * cursor->header.height; size = sizeof(uint32_t) * cursor->header.width * cursor->header.height;
memcpy(c->data, cursor->chunk.data, size); qxl_unpack_chunks(c->data, size, qxl, &cursor->chunk, group_id);
if (qxl->debug > 2) { if (qxl->debug > 2) {
cursor_print_ascii_art(c, "qxl/alpha"); cursor_print_ascii_art(c, "qxl/alpha");
} }
@ -259,11 +285,7 @@ int qxl_render_cursor(PCIQXLDevice *qxl, QXLCommandExt *ext)
if (!cursor) { if (!cursor) {
return 1; return 1;
} }
if (cursor->chunk.data_size != cursor->data_size) { c = qxl_cursor(qxl, cursor, ext->group_id);
fprintf(stderr, "%s: multiple chunks\n", __FUNCTION__);
return 1;
}
c = qxl_cursor(qxl, cursor);
if (c == NULL) { if (c == NULL) {
c = cursor_builtin_left_ptr(); c = cursor_builtin_left_ptr();
} }