diff options
| author | Alexander Larsson <alexl@redhat.com> | 2010-05-03 12:08:00 +0200 |
|---|---|---|
| committer | Alexander Larsson <alexl@redhat.com> | 2010-05-03 12:38:02 +0200 |
| commit | ae40f270cfbe4629c041074e2b0c28dfd3f554b8 (patch) | |
| tree | 5bfcd3f0e129f3c098eb26334b71af54762356d2 /common/gl_canvas.c | |
| parent | 295c8ed8bc508d69c88ec83b82afc4573500ff12 (diff) | |
| download | spice-ae40f270cfbe4629c041074e2b0c28dfd3f554b8.tar.gz spice-ae40f270cfbe4629c041074e2b0c28dfd3f554b8.tar.xz spice-ae40f270cfbe4629c041074e2b0c28dfd3f554b8.zip | |
Remove all mentions of "cairo" from the code
The command line option is renamed from "cairo" to "sw", and
similarly all filenames and types from Cairo to Sw (and similar).
Diffstat (limited to 'common/gl_canvas.c')
| -rw-r--r-- | common/gl_canvas.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/common/gl_canvas.c b/common/gl_canvas.c index 63d69779..82c846ed 100644 --- a/common/gl_canvas.c +++ b/common/gl_canvas.c @@ -812,7 +812,7 @@ static void gl_canvas_group_end(SpiceCanvas *spice_canvas) static void gl_canvas_set_access_params(SpiceCanvas *spice_canvas, unsigned long base, unsigned long max) { -#ifdef CAIRO_CANVAS_ACCESS_TEST +#ifdef SW_CANVAS_ACCESS_TEST GLCanvas *canvas = (GLCanvas *)spice_canvas; __canvas_set_access_params(&canvas->base, base, max); #endif @@ -822,15 +822,15 @@ static int need_init = 1; static SpiceCanvasOps gl_canvas_ops; SpiceCanvas *gl_canvas_create(int width, int height, uint32_t format -#ifdef CAIRO_CANVAS_CACHE +#ifdef SW_CANVAS_CACHE , SpiceImageCache *bits_cache , SpicePaletteCache *palette_cache -#elif defined(CAIRO_CANVAS_IMAGE_CACHE) +#elif defined(SW_CANVAS_IMAGE_CACHE) , SpiceImageCache *bits_cache #endif , SpiceImageSurfaces *surfaces , SpiceGlzDecoder *glz_decoder -#ifndef CAIRO_CANVAS_NO_CHUNKS +#ifndef SW_CANVAS_NO_CHUNKS , SpiceVirtMapping *virt_mapping #endif ) @@ -849,15 +849,15 @@ SpiceCanvas *gl_canvas_create(int width, int height, uint32_t format canvas->private_data = NULL; init_ok = canvas_base_init(&canvas->base, &gl_canvas_ops, width, height, format -#ifdef CAIRO_CANVAS_CACHE +#ifdef SW_CANVAS_CACHE , bits_cache , palette_cache -#elif defined(CAIRO_CANVAS_IMAGE_CACHE) +#elif defined(SW_CANVAS_IMAGE_CACHE) , bits_cache #endif , surfaces , glz_decoder -#ifndef CAIRO_CANVAS_NO_CHUNKS +#ifndef SW_CANVAS_NO_CHUNKS , virt_mapping #endif ); |