diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2010-06-23 14:39:37 +0200 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2010-06-29 12:29:41 +0200 |
| commit | 28b990c0d93d40ae3111bb1f58b18e11083c863f (patch) | |
| tree | 30122653520668080994d95c0474cc746e911f00 | |
| parent | b64d99aea36c8f9dc276b0a28daf19f66790f8e6 (diff) | |
qxl abi: add Copy+Blend.
Add QXLCopy and QXlBlend, also fix tyops (s/rop_decriptor/rop_descriptor/).
| -rw-r--r-- | spice/draw.h | 2 | ||||
| -rw-r--r-- | 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; |