pxcloud/spice
6
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/spice synced 2026-08-10 18:53:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

red-qxl: Remove surface_create field

Browse Source 
This field was used just to store a value and retrieve again
while we can just pass it instead.

Signed-off-by: Frediano Ziglio <fziglio@redhat.com>
Acked-by: Jonathon Jongsma <jjongsma@redhat.com>
This commit is contained in:
Frediano Ziglio 2017-10-13 09:02:29 +01:00
parent 7b7a842a4e
commit b83eb77c30
3 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
server/red-qxl.c
View File

@ -50,7 +50,6 @@ struct QXLState {
int x_res;
int y_res;
int use_hardware_cursor;
QXLDevSurfaceCreate surface_create;
unsigned int max_monitors;
RedsState *reds;
RedWorker *worker;
@ -346,17 +345,14 @@ static void qxl_worker_destroy_primary_surface(QXLWorker *qxl_worker, uint32_t s
}
/* used by RedWorker */
void red_qxl_create_primary_surface_complete(QXLState *qxl_state)
void red_qxl_create_primary_surface_complete(QXLState *qxl_state, const QXLDevSurfaceCreate *surface)
{
QXLDevSurfaceCreate *surface = &qxl_state->surface_create;
qxl_state->x_res = surface->width;
qxl_state->y_res = surface->height;
qxl_state->use_hardware_cursor = surface->mouse_mode;
qxl_state->primary_active = TRUE;
reds_update_client_mouse_allowed(qxl_state->reds);
memset(&qxl_state->surface_create, 0, sizeof(QXLDevSurfaceCreate));
}
static void
@ -366,7 +362,6 @@ red_qxl_create_primary_surface_async(QXLState *qxl_state, uint32_t surface_id,
RedWorkerMessageCreatePrimarySurfaceAsync payload;
RedWorkerMessage message = RED_WORKER_MESSAGE_CREATE_PRIMARY_SURFACE_ASYNC;
qxl_state->surface_create = *surface;
payload.base.cookie = cookie;
payload.surface_id = surface_id;
payload.surface = *surface;
@ -379,13 +374,12 @@ red_qxl_create_primary_surface_sync(QXLState *qxl_state, uint32_t surface_id,
{
RedWorkerMessageCreatePrimarySurface payload = {0,};
qxl_state->surface_create = *surface;
payload.surface_id = surface_id;
payload.surface = *surface;
dispatcher_send_message(qxl_state->dispatcher,
RED_WORKER_MESSAGE_CREATE_PRIMARY_SURFACE,
&payload);
red_qxl_create_primary_surface_complete(qxl_state);
red_qxl_create_primary_surface_complete(qxl_state, surface);
}
static void

2
server/red-worker.c
View File

@ -707,7 +707,7 @@ static void handle_dev_create_primary_surface_async(void *opaque, void *payload)
RedWorker *worker = opaque;
dev_create_primary_surface(worker, msg->surface_id, msg->surface);
red_qxl_create_primary_surface_complete(worker->qxl->st);
red_qxl_create_primary_surface_complete(worker->qxl->st, &msg->surface);
red_qxl_async_complete(worker->qxl, msg->base.cookie);
}

2
server/red-worker.h
View File

@ -38,7 +38,7 @@ void red_worker_free(RedWorker *worker);
struct Dispatcher *red_qxl_get_dispatcher(QXLInstance *qxl);
void red_qxl_destroy_primary_surface_complete(QXLState *qxl_state);
void red_qxl_create_primary_surface_complete(QXLState *qxl_state);
void red_qxl_create_primary_surface_complete(QXLState *qxl_state, const QXLDevSurfaceCreate* surface);
typedef uint32_t RedWorkerMessage;