From 28b990c0d93d40ae3111bb1f58b18e11083c863f Mon Sep 17 00:00:00 2001
From: Gerd Hoffmann <kraxel@redhat.com>
Date: Wed, 23 Jun 2010 14:39:37 +0200
Subject: [PATCH] qxl abi: add Copy+Blend.

Add QXLCopy and QXlBlend, also fix tyops (s/rop_decriptor/rop_descriptor/).
---
 spice/draw.h    |  2 +-
 spice/qxl_dev.h | 16 ++++++++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/spice/draw.h b/spice/draw.h
index 3f277d8..dee444b 100644
--- a/spice/draw.h
+++ b/spice/draw.h
@@ -217,7 +217,7 @@ typedef struct SPICE_ATTR_PACKED SpiceOpaque {
 typedef struct SPICE_ATTR_PACKED SpiceCopy {
     SPICE_ADDRESS src_bitmap;
     SpiceRect src_area;
-    uint16_t rop_decriptor;
+    uint16_t rop_descriptor;
     uint8_t scale_mode;
     SpiceQMask mask;
 } SpiceCopy, SpiceBlend;
diff --git a/spice/qxl_dev.h b/spice/qxl_dev.h
index da18326..ef52e9a 100644
--- a/spice/qxl_dev.h
+++ b/spice/qxl_dev.h
@@ -318,6 +318,14 @@ typedef struct SPICE_ATTR_PACKED QXLOpaque {
     SpiceQMask mask;
 } QXLOpaque;
 
+typedef struct SPICE_ATTR_PACKED QXLCopy {
+    QXLPHYSICAL src_bitmap;
+    SpiceRect src_area;
+    uint16_t rop_descriptor;
+    uint8_t scale_mode;
+    SpiceQMask mask;
+} QXLCopy, QXLBlend;
+
 typedef struct SPICE_ATTR_PACKED QXLAlphaBlnd {
     uint16_t alpha_flags;
     uint8_t alpha;
@@ -343,11 +351,11 @@ typedef struct SPICE_ATTR_PACKED QXLCompatDrawable {
     union {
         QXLFill fill;
         QXLOpaque opaque;
-        SpiceCopy copy;
+        QXLCopy copy;
         SpiceTransparent transparent;
         QXLCompatAlphaBlnd alpha_blend;
         QXLCopyBits copy_bits;
-        SpiceBlend blend;
+        QXLBlend blend;
         SpiceRop3 rop3;
         SpiceStroke stroke;
         SpiceText text;
@@ -372,11 +380,11 @@ typedef struct SPICE_ATTR_PACKED QXLDrawable {
     union {
         QXLFill fill;
         QXLOpaque opaque;
-        SpiceCopy copy;
+        QXLCopy copy;
         SpiceTransparent transparent;
         QXLAlphaBlnd alpha_blend;
         QXLCopyBits copy_bits;
-        SpiceBlend blend;
+        QXLBlend blend;
         SpiceRop3 rop3;
         SpiceStroke stroke;
         SpiceText text;