diff options
Diffstat (limited to 'server')
| -rw-r--r-- | server/Makefile.am | 8 | ||||
| -rw-r--r-- | server/red_dispatcher.c | 6 | ||||
| -rw-r--r-- | server/red_worker.c | 4 | ||||
| -rw-r--r-- | server/red_worker.h | 2 | ||||
| -rw-r--r-- | server/reds.c | 6 |
5 files changed, 13 insertions, 13 deletions
diff --git a/server/Makefile.am b/server/Makefile.am index f1211689..baa61cfd 100644 --- a/server/Makefile.am +++ b/server/Makefile.am @@ -1,7 +1,7 @@ NULL = INCLUDES = \ - -I. \ + -I. \ -I$(top_srcdir)/common \ -I$(top_srcdir)/common/linux \ $(PROTOCOL_CFLAGS) \ @@ -12,14 +12,14 @@ INCLUDES = \ $(SSL_CFLAGS) \ $(CELT051_CFLAGS) \ $(SLIRP_CFLAGS) \ - -DCAIRO_CANVAS_IMAGE_CACHE \ + -DSW_CANVAS_IMAGE_CACHE \ -DRED_STATISTICS \ $(WARN_CFLAGS) \ $(VISIBILITY_HIDDEN_CFLAGS) \ $(NULL) -COMMON_SRCS = \ - $(top_srcdir)/common/cairo_canvas.c \ +COMMON_SRCS = \ + $(top_srcdir)/common/sw_canvas.c \ $(top_srcdir)/common/pixman_utils.c \ $(top_srcdir)/common/lines.c \ $(top_srcdir)/common/gl_canvas.c \ diff --git a/server/red_dispatcher.c b/server/red_dispatcher.c index 5b719bd0..b3cf8cd1 100644 --- a/server/red_dispatcher.c +++ b/server/red_dispatcher.c @@ -28,7 +28,7 @@ #include "vd_interface.h" #include "red_worker.h" #include "quic.h" -#include "cairo_canvas.h" +#include "sw_canvas.h" #include "gl_canvas.h" #include "reds.h" #include "red_dispatcher.h" @@ -131,7 +131,7 @@ typedef struct RendererInfo { } RendererInfo; static RendererInfo renderers_info[] = { - {RED_RENDERER_CAIRO, "cairo"}, + {RED_RENDERER_SW, "sw"}, {RED_RENDERER_OGL_PBUF, "oglpbuf"}, {RED_RENDERER_OGL_PIXMAP, "oglpixmap"}, {RED_RENDERER_INVALID, NULL}, @@ -483,7 +483,7 @@ RedDispatcher *red_dispatcher_init(QXLInterface *qxl_interface) } quic_init(); - cairo_canvas_init(); + sw_canvas_init(); gl_canvas_init(); if (socketpair(AF_LOCAL, SOCK_STREAM, 0, channels) == -1) { diff --git a/server/red_worker.c b/server/red_worker.c index e9b2ade2..59cca3d1 100644 --- a/server/red_worker.c +++ b/server/red_worker.c @@ -36,7 +36,7 @@ #include "region.h" #include <spice/protocol.h> #include "red_worker.h" -#include "cairo_canvas.h" +#include "sw_canvas.h" #include "gl_canvas.h" #include "ogl_ctx.h" #include "quic.h" @@ -7951,7 +7951,7 @@ static inline void *create_canvas_for_surface(RedWorker *worker, RedSurface *sur SpiceCanvas *canvas; switch (renderer) { - case RED_RENDERER_CAIRO: + case RED_RENDERER_SW: canvas = canvas_create_for_data(width, height, format, line_0, stride, &worker->image_cache.base, diff --git a/server/red_worker.h b/server/red_worker.h index e54e4bf1..58072370 100644 --- a/server/red_worker.h +++ b/server/red_worker.h @@ -77,7 +77,7 @@ typedef uint32_t RedWorkeMessage; enum { RED_RENDERER_INVALID, - RED_RENDERER_CAIRO, + RED_RENDERER_SW, RED_RENDERER_OGL_PBUF, RED_RENDERER_OGL_PIXMAP, }; diff --git a/server/reds.c b/server/reds.c index 7d7fd443..866f35af 100644 --- a/server/reds.c +++ b/server/reds.c @@ -81,7 +81,7 @@ static int spice_port = -1; static int spice_secure_port = -1; static char spice_addr[256]; static int spice_family = PF_UNSPEC; -static char *default_renderer = "cairo"; +static char *default_renderer = "sw"; static int ticketing_enabled = 1; //Ticketing is enabled by default static pthread_mutex_t *lock_cs; @@ -4038,7 +4038,7 @@ int __attribute__ ((visibility ("default"))) spice_parse_args(const char *in_arg } } while (args); - if (!renderers_opt && !red_dispatcher_add_renderer("cairo")) { + if (!renderers_opt && !red_dispatcher_add_renderer("sw")) { goto error; } @@ -4061,7 +4061,7 @@ const char *spice_usage_str[] __attribute__ ((visibility ("default"))) = { "[,ic=on|auto_glz|auto_lz|quic|glz|lz|off]", "[,playback-compression=on|off]", "[,password=password][,disable-ticketing]", - "[,renderer=oglpbuf+oglpixmap+cairo]", + "[,renderer=oglpbuf+oglpixmap+sw]", "[,sslkeys=key directory,sslcerts=certs directory,sslpassword=pem password,", " sslciphersuite=cipher suite]", "[,secure-channels=all|channel+channel+...]", |