diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2010-06-23 08:49:48 +0200 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2010-06-29 12:29:04 +0200 |
| commit | de94076219fa14cadec32388988accb55186fd9d (patch) | |
| tree | 1e3be54c00d936684867394450aefa6715b85594 | |
| parent | 201ef133fa592652f5e59afefbf76ffc83134120 (diff) | |
qxl abi: add Fill.
Add QXLFill, also fix tyops (s/rop_decriptor/rop_descriptor/).
| -rw-r--r-- | spice/draw.h | 2 | ||||
| -rw-r--r-- | spice/qxl_dev.h | 10 |
2 files changed, 9 insertions, 3 deletions
diff --git a/spice/draw.h b/spice/draw.h index e6fab5c..42cd025 100644 --- a/spice/draw.h +++ b/spice/draw.h @@ -106,7 +106,7 @@ typedef struct SPICE_ATTR_PACKED SpiceQMask { typedef struct SPICE_ATTR_PACKED SpiceFill { SpiceBrush brush; - uint16_t rop_decriptor; + uint16_t rop_descriptor; SpiceQMask mask; } SpiceFill; diff --git a/spice/qxl_dev.h b/spice/qxl_dev.h index 9d62905..b95f920 100644 --- a/spice/qxl_dev.h +++ b/spice/qxl_dev.h @@ -303,6 +303,12 @@ typedef struct SPICE_ATTR_PACKED QXLCopyBits { #define QXL_EFFECT_NOP 6 #define QXL_EFFECT_OPAQUE_BRUSH 7 +typedef struct SPICE_ATTR_PACKED QXLFill { + SpiceBrush brush; + uint16_t rop_descriptor; + SpiceQMask mask; +} QXLFill; + typedef struct SPICE_ATTR_PACKED QXLAlphaBlnd { uint16_t alpha_flags; uint8_t alpha; @@ -326,7 +332,7 @@ typedef struct SPICE_ATTR_PACKED QXLCompatDrawable { SpiceClip clip; uint32_t mm_time; union { - SpiceFill fill; + QXLFill fill; SpiceOpaque opaque; SpiceCopy copy; SpiceTransparent transparent; @@ -355,7 +361,7 @@ typedef struct SPICE_ATTR_PACKED QXLDrawable { int32_t surfaces_dest[3]; SpiceRect surfaces_rects[3]; union { - SpiceFill fill; + QXLFill fill; SpiceOpaque opaque; SpiceCopy copy; SpiceTransparent transparent; |