[Spice-commits] Branch '0.6' - 6 commits - spice/enums.h spice/qxl_dev.h

[Hans de Goede]

 spice/enums.h   |    4 ++--
 spice/qxl_dev.h |   35 +++++++++++++++++++----------------
 2 files changed, 21 insertions(+), 18 deletions(-)

New commits:
commit c16264ba11d2a82700425d7403ae8d384ec3232c
Author: Alon Levy <alevy at redhat.com>
Date:   Thu Feb 10 18:51:30 2011 +0200

    enums: typedefy SpiceBitmapFmt

diff --git a/spice/enums.h b/spice/enums.h
index 3317536..1d7cd3b 100644
--- a/spice/enums.h
+++ b/spice/enums.h
@@ -142,7 +142,7 @@ enum SpiceImageFlags {
     SPICE_IMAGE_FLAGS_MASK = 0x7
 };
 
-enum SpiceBitmapFmt {
+typedef enum SpiceBitmapFmt {
     SPICE_BITMAP_FMT_INVALID,
     SPICE_BITMAP_FMT_1BIT_LE,
     SPICE_BITMAP_FMT_1BIT_BE,
@@ -155,7 +155,7 @@ enum SpiceBitmapFmt {
     SPICE_BITMAP_FMT_RGBA,
 
     SPICE_BITMAP_FMT_ENUM_END
-};
+} SpiceBitmapFmt;
 
 enum SpiceBitmapFlags {
     SPICE_BITMAP_FLAGS_PAL_CACHE_ME = (1 << 0),
commit e81a1c2eb24e21603829983c70cc0b75f56466f7
Author: Alon Levy <alevy at redhat.com>
Date:   Thu Feb 10 15:42:47 2011 +0200

    qxl_dev.h: make QXLEffectType an enum instead of defines

diff --git a/spice/qxl_dev.h b/spice/qxl_dev.h
index 0bdbe55..7219bfc 100644
--- a/spice/qxl_dev.h
+++ b/spice/qxl_dev.h
@@ -340,14 +340,17 @@ typedef struct SPICE_ATTR_PACKED QXLCopyBits {
     QXLPoint src_pos;
 } QXLCopyBits;
 
-#define QXL_EFFECT_BLEND 0
-#define QXL_EFFECT_OPAQUE 1
-#define QXL_EFFECT_REVERT_ON_DUP 2
-#define QXL_EFFECT_BLACKNESS_ON_DUP 3
-#define QXL_EFFECT_WHITENESS_ON_DUP 4
-#define QXL_EFFECT_NOP_ON_DUP 5
-#define QXL_EFFECT_NOP 6
-#define QXL_EFFECT_OPAQUE_BRUSH 7
+typedef enum QXLEffectType
+{
+    QXL_EFFECT_BLEND = 0,
+    QXL_EFFECT_OPAQUE = 1,
+    QXL_EFFECT_REVERT_ON_DUP = 2,
+    QXL_EFFECT_BLACKNESS_ON_DUP = 3,
+    QXL_EFFECT_WHITENESS_ON_DUP = 4,
+    QXL_EFFECT_NOP_ON_DUP = 5,
+    QXL_EFFECT_NOP = 6,
+    QXL_EFFECT_OPAQUE_BRUSH = 7
+} QXLEffectType;
 
 typedef struct SPICE_ATTR_PACKED QXLPattern {
     QXLPHYSICAL pat;
commit b195a4a7dc1fba65b1ced5d1482dabf5dd55f164
Author: Alon Levy <alevy at redhat.com>
Date:   Thu Feb 10 15:42:24 2011 +0200

    qxl_dev.h: make QXLBitmapFlags a typedef

diff --git a/spice/qxl_dev.h b/spice/qxl_dev.h
index ab12c07..0bdbe55 100644
--- a/spice/qxl_dev.h
+++ b/spice/qxl_dev.h
@@ -579,11 +579,11 @@ typedef enum QXLImageFlags {
     QXL_IMAGE_HIGH_BITS_SET = (1 << 1),
 } QXLImageFlags;
 
-enum {
+typedef enum QXLBitmapFlags {
     QXL_BITMAP_DIRECT = (1 << 0),
     QXL_BITMAP_UNSTABLE = (1 << 1),
     QXL_BITMAP_TOP_DOWN = (1 << 2), // == SPICE_BITMAP_FLAGS_TOP_DOWN
-};
+} QXLBitmapFlags;
 
 #define QXL_SET_IMAGE_ID(image, _group, _unique) {              \
     (image)->descriptor.id = (((uint64_t)_unique) << 32) | _group;	\
commit 55aff9e3ecfc2c1d9b69668af9eb8ef049b4e913
Author: Alon Levy <alevy at redhat.com>
Date:   Thu Feb 10 15:42:01 2011 +0200

    qxl_dev.h: make QXLSurfaceCmdType a typedef

diff --git a/spice/qxl_dev.h b/spice/qxl_dev.h
index 2b2bb56..ab12c07 100644
--- a/spice/qxl_dev.h
+++ b/spice/qxl_dev.h
@@ -511,10 +511,10 @@ typedef struct SPICE_ATTR_PACKED QXLDrawable {
     } u;
 } QXLDrawable;
 
-enum QXLSurfaceCmdType {
+typedef enum QXLSurfaceCmdType {
     QXL_SURFACE_CMD_CREATE,
     QXL_SURFACE_CMD_DESTROY,
-};
+} QXLSurfaceCmdType;
 
 typedef struct SPICE_ATTR_PACKED QXLSurface {
     uint32_t format;
commit 449addc85704fce82f2721abe9812f5d4f0f1655
Author: Alon Levy <alevy at redhat.com>
Date:   Thu Feb 10 13:01:52 2011 +0200

    qxl_dev.h: name QXL_IMAGE_* flags as type and enum QXLImageFlags

diff --git a/spice/qxl_dev.h b/spice/qxl_dev.h
index 354008d..2b2bb56 100644
--- a/spice/qxl_dev.h
+++ b/spice/qxl_dev.h
@@ -574,10 +574,10 @@ typedef union {
   uint64_t value;
 } QXLImageIDUnion;
 
-enum {
+typedef enum QXLImageFlags {
     QXL_IMAGE_CACHE = (1 << 0),
     QXL_IMAGE_HIGH_BITS_SET = (1 << 1),
-};
+} QXLImageFlags;
 
 enum {
     QXL_BITMAP_DIRECT = (1 << 0),
commit 24452b82ca96ec3551b95f9a9a4859ce98796a2e
Author: Alon Levy <alevy at redhat.com>
Date:   Thu Feb 10 12:59:43 2011 +0200

    qxl_dev.h: make QXLCmdType enum also a typedef

diff --git a/spice/qxl_dev.h b/spice/qxl_dev.h
index ce9c61f..354008d 100644
--- a/spice/qxl_dev.h
+++ b/spice/qxl_dev.h
@@ -154,14 +154,14 @@ typedef struct SPICE_ATTR_PACKED QXLModes {
 } QXLModes;
 
 /* qxl-1 compat: append only */
-enum QXLCmdType {
+typedef enum QXLCmdType {
     QXL_CMD_NOP,
     QXL_CMD_DRAW,
     QXL_CMD_UPDATE,
     QXL_CMD_CURSOR,
     QXL_CMD_MESSAGE,
     QXL_CMD_SURFACE,
-};
+} QXLCmdType;
 
 /* qxl-1 compat: fixed */
 typedef struct SPICE_ATTR_PACKED QXLCommand {