Commit 9fd9bf36 authored by Alon Levy's avatar Alon Levy Committed by Søren Sandmann Pedersen

use spice-protocol qxl_dev.h enums

parent e18ea01e
...@@ -42,6 +42,8 @@ ...@@ -42,6 +42,8 @@
#include "uxa/uxa.h" #include "uxa/uxa.h"
#include "vgaHW.h" #include "vgaHW.h"
#include <spice/qxl_dev.h>
#define hidden _X_HIDDEN #define hidden _X_HIDDEN
#define QXL_NAME "qxl" #define QXL_NAME "qxl"
...@@ -54,27 +56,6 @@ ...@@ -54,27 +56,6 @@
#pragma pack(push,1) #pragma pack(push,1)
/* I/O port definitions */ /* I/O port definitions */
enum {
QXL_IO_NOTIFY_CMD,
QXL_IO_NOTIFY_CURSOR,
QXL_IO_UPDATE_AREA,
QXL_IO_UPDATE_IRQ,
QXL_IO_NOTIFY_OOM,
QXL_IO_RESET,
QXL_IO_SET_MODE, /* qxl 1 */
QXL_IO_LOG,
/* Appended in qxl 2 */
QXL_IO_MEMSLOT_ADD,
QXL_IO_MEMSLOT_DEL,
QXL_IO_DETACH_PRIMARY,
QXL_IO_ATTACH_PRIMARY,
QXL_IO_CREATE_PRIMARY,
QXL_IO_DESTROY_PRIMARY,
QXL_IO_DESTROY_SURFACE_WAIT,
QXL_IO_DESTROY_ALL_SURFACES,
QXL_IO_RANGE_SIZE
};
struct qxl_mode { struct qxl_mode {
uint32_t id; uint32_t id;
...@@ -87,16 +68,6 @@ struct qxl_mode { ...@@ -87,16 +68,6 @@ struct qxl_mode {
uint32_t orientation; uint32_t orientation;
}; };
typedef enum
{
QXL_CMD_NOP,
QXL_CMD_DRAW,
QXL_CMD_UPDATE,
QXL_CMD_CURSOR,
QXL_CMD_MESSAGE,
QXL_CMD_SURFACE
} qxl_command_type;
struct qxl_command { struct qxl_command {
uint64_t data; uint64_t data;
uint32_t type; uint32_t type;
...@@ -176,10 +147,6 @@ typedef enum { ...@@ -176,10 +147,6 @@ typedef enum {
QXL_IMAGE_TYPE_JPEG_ALPHA QXL_IMAGE_TYPE_JPEG_ALPHA
} qxl_image_type; } qxl_image_type;
typedef enum {
QXL_IMAGE_CACHE = (1 << 0)
} qxl_image_flags;
struct qxl_image_descriptor struct qxl_image_descriptor
{ {
uint64_t id; uint64_t id;
...@@ -210,24 +177,6 @@ typedef enum ...@@ -210,24 +177,6 @@ typedef enum
QXL_BITMAP_FMT_RGBA, QXL_BITMAP_FMT_RGBA,
} qxl_bitmap_format; } qxl_bitmap_format;
typedef enum {
QXL_BITMAP_PAL_CACHE_ME = (1 << 0),
QXL_BITMAP_PAL_FROM_CACHE = (1 << 1),
QXL_BITMAP_TOP_DOWN = (1 << 2),
} qxl_bitmap_flags;
typedef enum {
QXL_SURFACE_FMT_INVALID,
QXL_SURFACE_FMT_1_A,
QXL_SURFACE_FMT_8_A = 8,
QXL_SURFACE_FMT_16_555 = 16,
QXL_SURFACE_FMT_32_xRGB = 32,
QXL_SURFACE_FMT_16_565 = 80,
QXL_SURFACE_FMT_32_ARGB = 96,
SPICE_SURFACE_FMT_ENUM_END
} qxl_surface_fmt;
struct qxl_bitmap { struct qxl_bitmap {
uint8_t format; uint8_t format;
uint8_t flags; uint8_t flags;
...@@ -344,17 +293,6 @@ struct qxl_whiteness { ...@@ -344,17 +293,6 @@ struct qxl_whiteness {
}; };
/* Effects */ /* Effects */
typedef enum
{
QXL_EFFECT_BLEND,
QXL_EFFECT_OPAQUE,
QXL_EFFECT_REVERT_ON_DUP,
QXL_EFFECT_BLACKNESS_ON_DUP,
QXL_EFFECT_WHITENESS_ON_DUP,
QXL_EFFECT_NOP_ON_DUP,
QXL_EFFECT_NOP,
QXL_EFFECT_OPAQUE_BRUSH
} qxl_effect_type;
typedef enum typedef enum
{ {
...@@ -363,23 +301,6 @@ typedef enum ...@@ -363,23 +301,6 @@ typedef enum
QXL_CLIP_TYPE_PATH, QXL_CLIP_TYPE_PATH,
} qxl_clip_type; } qxl_clip_type;
typedef enum {
QXL_DRAW_NOP,
QXL_DRAW_FILL,
QXL_DRAW_OPAQUE,
QXL_DRAW_COPY,
QXL_COPY_BITS,
QXL_DRAW_BLEND,
QXL_DRAW_BLACKNESS,
QXL_DRAW_WHITENESS,
QXL_DRAW_INVERS,
QXL_DRAW_ROP3,
QXL_DRAW_STROKE,
QXL_DRAW_TEXT,
QXL_DRAW_TRANSPARENT,
QXL_DRAW_ALPHA_BLEND,
} qxl_draw_type;
/* QXL 1 */ /* QXL 1 */
struct qxl_compat_drawable { struct qxl_compat_drawable {
union qxl_release_info release_info; union qxl_release_info release_info;
...@@ -437,11 +358,6 @@ struct qxl_drawable { ...@@ -437,11 +358,6 @@ struct qxl_drawable {
} u; } u;
}; };
typedef enum {
QXL_SURFACE_CMD_CREATE,
QXL_SURFACE_CMD_DESTROY
} qxl_surface_cmd_type;
struct qxl_surface_info struct qxl_surface_info
{ {
uint32_t format; uint32_t format;
...@@ -481,13 +397,6 @@ struct qxl_point16 { ...@@ -481,13 +397,6 @@ struct qxl_point16 {
int16_t y; int16_t y;
}; };
enum {
QXL_CURSOR_SET,
QXL_CURSOR_MOVE,
QXL_CURSOR_HIDE,
QXL_CURSOR_TRAIL,
};
#define QXL_CURSOR_DEVICE_DATA_SIZE 128 #define QXL_CURSOR_DEVICE_DATA_SIZE 128
enum { enum {
......
...@@ -232,22 +232,22 @@ get_formats (int bpp, qxl_bitmap_format *format, pixman_format_code_t *pformat) ...@@ -232,22 +232,22 @@ get_formats (int bpp, qxl_bitmap_format *format, pixman_format_code_t *pformat)
switch (bpp) switch (bpp)
{ {
case 8: case 8:
*format = QXL_SURFACE_FMT_8_A; *format = SPICE_SURFACE_FMT_8_A;
*pformat = PIXMAN_a8; *pformat = PIXMAN_a8;
break; break;
case 16: case 16:
*format = QXL_SURFACE_FMT_16_565; *format = SPICE_SURFACE_FMT_16_565;
*pformat = PIXMAN_r5g6b5; *pformat = PIXMAN_r5g6b5;
break; break;
case 24: case 24:
*format = QXL_SURFACE_FMT_32_xRGB; *format = SPICE_SURFACE_FMT_32_xRGB;
*pformat = PIXMAN_a8r8g8b8; *pformat = PIXMAN_a8r8g8b8;
break; break;
case 32: case 32:
*format = QXL_SURFACE_FMT_32_ARGB; *format = SPICE_SURFACE_FMT_32_ARGB;
*pformat = PIXMAN_a8r8g8b8; *pformat = PIXMAN_a8r8g8b8;
break; break;
...@@ -406,7 +406,7 @@ qxl_surface_cache_create_primary (surface_cache_t *cache, ...@@ -406,7 +406,7 @@ qxl_surface_cache_create_primary (surface_cache_t *cache,
} }
static struct qxl_surface_cmd * static struct qxl_surface_cmd *
make_surface_cmd (surface_cache_t *cache, uint32_t id, qxl_surface_cmd_type type) make_surface_cmd (surface_cache_t *cache, uint32_t id, QXLSurfaceCmdType type)
{ {
struct qxl_surface_cmd *cmd; struct qxl_surface_cmd *cmd;
qxl_screen_t *qxl = cache->qxl; qxl_screen_t *qxl = cache->qxl;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment