diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2010-06-23 09:06:59 +0200 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2010-06-29 12:29:35 +0200 |
| commit | b64d99aea36c8f9dc276b0a28daf19f66790f8e6 (patch) | |
| tree | 0cd22d74428374a34d32db641aedfb88ed470931 | |
| parent | de94076219fa14cadec32388988accb55186fd9d (diff) | |
qxl abi: add Opaque.
Add QXLOpaque, also fix tyops (s/rop_decriptor/rop_descriptor/).
| -rw-r--r-- | spice/draw.h | 2 | ||||
| -rw-r--r-- | spice/qxl_dev.h | 13 |
2 files changed, 12 insertions, 3 deletions
diff --git a/spice/draw.h b/spice/draw.h index 42cd025..3f277d8 100644 --- a/spice/draw.h +++ b/spice/draw.h @@ -209,7 +209,7 @@ typedef struct SPICE_ATTR_PACKED SpiceOpaque { SPICE_ADDRESS src_bitmap; SpiceRect src_area; SpiceBrush brush; - uint16_t rop_decriptor; + uint16_t rop_descriptor; uint8_t scale_mode; SpiceQMask mask; } SpiceOpaque; diff --git a/spice/qxl_dev.h b/spice/qxl_dev.h index b95f920..da18326 100644 --- a/spice/qxl_dev.h +++ b/spice/qxl_dev.h @@ -309,6 +309,15 @@ typedef struct SPICE_ATTR_PACKED QXLFill { SpiceQMask mask; } QXLFill; +typedef struct SPICE_ATTR_PACKED QXLOpaque { + QXLPHYSICAL src_bitmap; + SpiceRect src_area; + SpiceBrush brush; + uint16_t rop_descriptor; + uint8_t scale_mode; + SpiceQMask mask; +} QXLOpaque; + typedef struct SPICE_ATTR_PACKED QXLAlphaBlnd { uint16_t alpha_flags; uint8_t alpha; @@ -333,7 +342,7 @@ typedef struct SPICE_ATTR_PACKED QXLCompatDrawable { uint32_t mm_time; union { QXLFill fill; - SpiceOpaque opaque; + QXLOpaque opaque; SpiceCopy copy; SpiceTransparent transparent; QXLCompatAlphaBlnd alpha_blend; @@ -362,7 +371,7 @@ typedef struct SPICE_ATTR_PACKED QXLDrawable { SpiceRect surfaces_rects[3]; union { QXLFill fill; - SpiceOpaque opaque; + QXLOpaque opaque; SpiceCopy copy; SpiceTransparent transparent; QXLAlphaBlnd alpha_blend; |