diff options
| author | Marc-André Lureau <marcandre.lureau@gmail.com> | 2015-10-29 16:54:46 -0500 |
|---|---|---|
| committer | Frediano Ziglio <fziglio@redhat.com> | 2015-11-02 16:02:23 +0000 |
| commit | fb84cc956f3b5848eed2d128fb9e9d27cc0a4db6 (patch) | |
| tree | 767ed6860d69354c3c9bcd9ccaf91f90d26b877c /server | |
| parent | 7198a0643385f0f42a0f39cd866c300c07bef5b1 (diff) | |
| download | spice-fb84cc956f3b5848eed2d128fb9e9d27cc0a4db6.tar.gz spice-fb84cc956f3b5848eed2d128fb9e9d27cc0a4db6.tar.xz spice-fb84cc956f3b5848eed2d128fb9e9d27cc0a4db6.zip | |
Move pipe item enumerations out of red_worker.h
Move the cursor-specific pipe item types to cursor-channel.h, and the
display-specific types to red_worker.c. Only leave the common
definitions in red_worker.h. This prepares for splitting the display
channel into a separate file.
Signed-off-by: Jonathon Jongsma <jjongsma@redhat.com>
Acked-by: Fabiano Fidêncio <fidencio@redhat.com>
Diffstat (limited to 'server')
| -rw-r--r-- | server/cursor-channel.h | 6 | ||||
| -rw-r--r-- | server/red_worker.c | 17 | ||||
| -rw-r--r-- | server/red_worker.h | 21 |
3 files changed, 26 insertions, 18 deletions
diff --git a/server/cursor-channel.h b/server/cursor-channel.h index 293cfc18..67e6e3fa 100644 --- a/server/cursor-channel.h +++ b/server/cursor-channel.h @@ -32,6 +32,12 @@ #define CURSOR_CACHE_HASH_MASK (CURSOR_CACHE_HASH_SIZE - 1) #define CURSOR_CACHE_HASH_KEY(id) ((id) & CURSOR_CACHE_HASH_MASK) +enum { + PIPE_ITEM_TYPE_CURSOR = PIPE_ITEM_TYPE_COMMON_LAST, + PIPE_ITEM_TYPE_CURSOR_INIT, + PIPE_ITEM_TYPE_INVAL_CURSOR_CACHE, +}; + typedef struct CursorItem { uint32_t group_id; int refs; diff --git a/server/red_worker.c b/server/red_worker.c index 37330c9b..e3999baa 100644 --- a/server/red_worker.c +++ b/server/red_worker.c @@ -229,6 +229,23 @@ struct SpiceWatch { void *watch_func_opaque; }; +enum { + PIPE_ITEM_TYPE_DRAW = PIPE_ITEM_TYPE_COMMON_LAST, + PIPE_ITEM_TYPE_IMAGE, + PIPE_ITEM_TYPE_STREAM_CREATE, + PIPE_ITEM_TYPE_STREAM_CLIP, + PIPE_ITEM_TYPE_STREAM_DESTROY, + PIPE_ITEM_TYPE_UPGRADE, + PIPE_ITEM_TYPE_MIGRATE_DATA, + PIPE_ITEM_TYPE_PIXMAP_SYNC, + PIPE_ITEM_TYPE_PIXMAP_RESET, + PIPE_ITEM_TYPE_INVAL_PALETTE_CACHE, + PIPE_ITEM_TYPE_CREATE_SURFACE, + PIPE_ITEM_TYPE_DESTROY_SURFACE, + PIPE_ITEM_TYPE_MONITORS_CONFIG, + PIPE_ITEM_TYPE_STREAM_ACTIVATE_REPORT, +}; + #define MAX_LZ_ENCODERS MAX_CACHE_CLIENTS typedef struct SurfaceCreateItem { diff --git a/server/red_worker.h b/server/red_worker.h index 76502b6e..aa977071 100644 --- a/server/red_worker.h +++ b/server/red_worker.h @@ -48,25 +48,10 @@ typedef struct CommonChannel { } CommonChannel; enum { - PIPE_ITEM_TYPE_DRAW = PIPE_ITEM_TYPE_CHANNEL_BASE, + PIPE_ITEM_TYPE_VERB = PIPE_ITEM_TYPE_CHANNEL_BASE, PIPE_ITEM_TYPE_INVAL_ONE, - PIPE_ITEM_TYPE_CURSOR, - PIPE_ITEM_TYPE_CURSOR_INIT, - PIPE_ITEM_TYPE_IMAGE, - PIPE_ITEM_TYPE_STREAM_CREATE, - PIPE_ITEM_TYPE_STREAM_CLIP, - PIPE_ITEM_TYPE_STREAM_DESTROY, - PIPE_ITEM_TYPE_UPGRADE, - PIPE_ITEM_TYPE_VERB, - PIPE_ITEM_TYPE_MIGRATE_DATA, - PIPE_ITEM_TYPE_PIXMAP_SYNC, - PIPE_ITEM_TYPE_PIXMAP_RESET, - PIPE_ITEM_TYPE_INVAL_CURSOR_CACHE, - PIPE_ITEM_TYPE_INVAL_PALETTE_CACHE, - PIPE_ITEM_TYPE_CREATE_SURFACE, - PIPE_ITEM_TYPE_DESTROY_SURFACE, - PIPE_ITEM_TYPE_MONITORS_CONFIG, - PIPE_ITEM_TYPE_STREAM_ACTIVATE_REPORT, + + PIPE_ITEM_TYPE_COMMON_LAST }; typedef struct VerbItem { |