pxcloud/spice
5
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/spice synced 2025-12-27 07:29:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Store 'renderers' as GArray in RedsState

Browse Source 
Acked-by: Jonathon Jongsma <jjongsma@redhat.com>
Acked-by: Frediano Ziglio <fziglio@redhat.com>
This commit is contained in:
Frediano Ziglio 2016-02-11 12:37:20 +00:00
parent 127e3ad191
commit 5c1d744d85
5 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
server/display-channel.c
View File

@ -1911,10 +1911,12 @@ void display_channel_create_surface(DisplayChannel *display, uint32_t surface_id
if (display->renderer == RED_RENDERER_INVALID) {
int i;
for (i = 0; i < display->num_renderers; i++) {
surface->context.canvas = create_canvas_for_surface(display, surface, display->renderers[i]);
GArray *renderers = reds_get_renderers(reds);
for (i = 0; i < renderers->len; i++) {
uint32_t renderer = g_array_index(renderers, uint32_t, i);
surface->context.canvas = create_canvas_for_surface(display, surface, renderer);
if (surface->context.canvas) {
display->renderer = display->renderers[i];
display->renderer = renderer;
break;
}
}
@ -2031,8 +2033,6 @@ DisplayChannel* display_channel_new(RedWorker *worker, int migrate, int stream_v
image_surfaces_get,
};
spice_return_val_if_fail(num_renderers > 0, NULL);
spice_info("create display channel");
display = (DisplayChannel *)red_worker_new_channel(
worker, sizeof(*display), "display_channel",
@ -2063,8 +2063,6 @@ DisplayChannel* display_channel_new(RedWorker *worker, int migrate, int stream_v
stat_compress_init(&display->lz4_stat, "lz4", stat_clock);
display->n_surfaces = n_surfaces;
display->num_renderers = num_renderers;
memcpy(display->renderers, renderers, sizeof(display->renderers));
display->renderer = RED_RENDERER_INVALID;
ring_init(&display->current_list);

2
server/display-channel.h
View File

@ -170,8 +170,6 @@ struct DisplayChannel {
MonitorsConfig *monitors_config;
uint32_t num_renderers;
uint32_t renderers[RED_RENDERER_LAST];
uint32_t renderer;
int enable_jpeg;
int enable_zlib_glz_wrap;

1
server/reds-private.h
View File

@ -208,6 +208,7 @@ struct RedsState {
int default_channel_security;
ChannelSecurityOptions *channels_security;
GArray *renderers;
int spice_port;
int spice_secure_port;

22
server/reds.c
View File

@ -3414,6 +3414,7 @@ SPICE_GNUC_VISIBLE SpiceServer *spice_server_new(void)
reds = spice_new0(RedsState, 1);
reds->default_channel_security =
SPICE_CHANNEL_SECURITY_NONE | SPICE_CHANNEL_SECURITY_SSL;
reds->renderers = g_array_sized_new(FALSE, TRUE, sizeof(uint32_t), RED_RENDERER_LAST);
reds->spice_port = -1;
reds->spice_secure_port = -1;
reds->spice_listen_socket_fd = -1;
@ -3446,9 +3447,6 @@ static const RendererInfo renderers_info[] = {
{RED_RENDERER_INVALID, NULL},
};
uint32_t renderers[RED_RENDERER_LAST];
uint32_t num_renderers = 0;
static const RendererInfo *find_renderer(const char *name)
{
const RendererInfo *inf = renderers_info;
@ -3461,14 +3459,14 @@ static const RendererInfo *find_renderer(const char *name)
return NULL;
}
static int red_add_renderer(const char *name)
static int reds_add_renderer(RedsState *reds, const char *name)
{
const RendererInfo *inf;
if (num_renderers == RED_RENDERER_LAST || !(inf = find_renderer(name))) {
if (reds->renderers->len == RED_RENDERER_LAST || !(inf = find_renderer(name))) {
return FALSE;
}
renderers[num_renderers++] = inf->id;
g_array_append_val(reds->renderers, inf->id);
return TRUE;
}
@ -3478,8 +3476,8 @@ SPICE_GNUC_VISIBLE int spice_server_init(SpiceServer *s, SpiceCoreInterface *cor
spice_assert(reds == s);
ret = do_spice_init(s, core);
if (num_renderers == 0) {
red_add_renderer(default_renderer);
if (s->renderers->len == 0) {
reds_add_renderer(s, default_renderer);
}
return ret;
}
@ -3487,6 +3485,7 @@ SPICE_GNUC_VISIBLE int spice_server_init(SpiceServer *s, SpiceCoreInterface *cor
SPICE_GNUC_VISIBLE void spice_server_destroy(SpiceServer *s)
{
spice_assert(reds == s);
g_array_unref(s->renderers);
reds_exit();
}
@ -3772,7 +3771,7 @@ SPICE_GNUC_VISIBLE int spice_server_is_server_mouse(SpiceServer *s)
SPICE_GNUC_VISIBLE int spice_server_add_renderer(SpiceServer *s, const char *name)
{
spice_assert(reds == s);
if (!red_add_renderer(name)) {
if (!reds_add_renderer(s, name)) {
return -1;
}
return 0;
@ -4026,6 +4025,11 @@ SPICE_GNUC_VISIBLE void spice_server_set_keepalive_timeout(SpiceServer *s, int t
spice_debug("keepalive timeout=%d", timeout);
}
GArray* reds_get_renderers(RedsState *reds)
{
return reds->renderers;
}
spice_wan_compression_t reds_get_jpeg_state(const RedsState *reds)
{
return reds->jpeg_state;

5
server/reds.h
View File

@ -66,6 +66,8 @@ gboolean reds_get_agent_mouse(const RedsState *reds); // used by inputs_channel
int reds_has_vdagent(RedsState *reds); // used by inputs channel
void reds_handle_agent_mouse_event(RedsState *reds, const VDAgentMouseState *mouse_state); // used by inputs_channel
GArray* reds_get_renderers(RedsState *reds);
enum {
RED_RENDERER_INVALID,
RED_RENDERER_SW,
@ -73,9 +75,6 @@ enum {
RED_RENDERER_LAST
};
extern uint32_t renderers[RED_RENDERER_LAST];
extern uint32_t num_renderers;
// Temporary measures to make splitting reds.c to inputs-channel.c easier
/* should be called only from main_dispatcher */