From ef3e20e29ff124eeb10729c0d512b1d231276394 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Wed, 23 Jun 2010 08:53:04 +0200 Subject: qxl abi: parse QXLFill. Also adapt to tyops fix (s/rop_decriptor/rop_descriptor/). --- server/red_parse_qxl.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'server/red_parse_qxl.c') diff --git a/server/red_parse_qxl.c b/server/red_parse_qxl.c index cbdbf720..7dad295b 100644 --- a/server/red_parse_qxl.c +++ b/server/red_parse_qxl.c @@ -20,6 +20,14 @@ #include "red_memslots.h" #include "red_parse_qxl.h" +static void red_get_fill_ptr(RedMemSlotInfo *slots, int group_id, + SpiceFill *red, QXLFill *qxl) +{ + red->brush = qxl->brush; + red->rop_descriptor = qxl->rop_descriptor; + red->mask = qxl->mask; +} + static void red_get_alpha_blend_ptr(RedMemSlotInfo *slots, int group_id, SpiceAlphaBlnd *red, QXLAlphaBlnd *qxl) { @@ -75,7 +83,7 @@ void red_get_drawable(RedMemSlotInfo *slots, int group_id, red->u.copy = qxl->u.copy; break; case QXL_DRAW_FILL: - red->u.fill = qxl->u.fill; + red_get_fill_ptr(slots, group_id, &red->u.fill, &qxl->u.fill); break; case QXL_DRAW_INVERS: red->u.invers = qxl->u.invers; @@ -129,7 +137,7 @@ void red_get_compat_drawable(RedMemSlotInfo *slots, int group_id, red->u.copy = qxl->u.copy; break; case QXL_DRAW_FILL: - red->u.fill = qxl->u.fill; + red_get_fill_ptr(slots, group_id, &red->u.fill, &qxl->u.fill); break; case QXL_DRAW_INVERS: red->u.invers = qxl->u.invers; -- cgit