File 5968dbd5-red-parse-qxl-Use-same-fuction-to-pars... of Package spice

Overview Repositories Revisions Requests Users Attributes Meta

File 5968dbd5-red-parse-qxl-Use-same-fuction-to-parse-blend-and-co.patch of Package spice

From e7023713726f51ccccba22d2c6d5814a6bd91406 Mon Sep 17 00:00:00 2001
From: Frediano Ziglio <fziglio@redhat.com>
Date: Sat, 29 Oct 2016 12:53:51 +0100
Subject: [PATCH] red-parse-qxl: Use same fuction to parse blend and copy
 commands

SpiceBlend and SpiceCopy are just different names for the same
structure.

Signed-off-by: Frediano Ziglio <fziglio@redhat.com>
Acked-by: Jonathon Jongsma <jjongsma@redhat.com>
(cherry picked from commit e7023713726f51ccccba22d2c6d5814a6bd91406)
[BR: BSC#1109044]
Signed-off-by: Bruce Rogers <brogers@suse.com>
---
 server/red_parse_qxl.c | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/server/red_parse_qxl.c b/server/red_parse_qxl.c
index 52425d4c..8a35b29e 100644
--- a/server/red_parse_qxl.c
+++ b/server/red_parse_qxl.c
@@ -674,15 +674,8 @@ static void red_put_copy(SpiceCopy *red)
     red_put_qmask(&red->mask);
 }
 
-static void red_get_blend_ptr(RedMemSlotInfo *slots, int group_id,
-                             SpiceBlend *red, QXLBlend *qxl, uint32_t flags)
-{
-    red->src_bitmap      = red_get_image(slots, group_id, qxl->src_bitmap, flags, FALSE);
-   red_get_rect_ptr(&red->src_area, &qxl->src_area);
-   red->rop_descriptor  = qxl->rop_descriptor;
-   red->scale_mode      = qxl->scale_mode;
-   red_get_qmask_ptr(slots, group_id, &red->mask, &qxl->mask, flags);
-}
+// these types are really the same thing
+#define red_get_blend_ptr red_get_copy_ptr
 
 static void red_put_blend(SpiceBlend *red)
 {
@@ -1042,7 +1035,7 @@ static int red_get_native_drawable(RedMemSlotInfo *slots, int group_id,
                               &red->u.blackness, &qxl->u.blackness, flags);
         break;
     case QXL_DRAW_BLEND:
-        red_get_blend_ptr(slots, group_id, &red->u.blend, &qxl->u.blend, flags);
+        error = red_get_blend_ptr(slots, group_id, &red->u.blend, &qxl->u.blend, flags);
         break;
     case QXL_DRAW_COPY:
         error = red_get_copy_ptr(slots, group_id, &red->u.copy, &qxl->u.copy, flags);
@@ -1124,7 +1117,7 @@ static int red_get_compat_drawable(RedMemSlotInfo *slots, int group_id,
                               &red->u.blackness, &qxl->u.blackness, flags);
         break;
     case QXL_DRAW_BLEND:
-        red_get_blend_ptr(slots, group_id, &red->u.blend, &qxl->u.blend, flags);
+        error = red_get_blend_ptr(slots, group_id, &red->u.blend, &qxl->u.blend, flags);
         break;
     case QXL_DRAW_COPY:
         error = red_get_copy_ptr(slots, group_id, &red->u.copy, &qxl->u.copy, flags);
-- 
2.19.0

Places

File 5968dbd5-red-parse-qxl-Use-same-fuction-to-parse-blend-and-co.patch of Package spice

Places