summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorChristophe Fergeau <cfergeau@redhat.com>2015-01-23 17:17:58 +0100
committerChristophe Fergeau <cfergeau@redhat.com>2015-03-26 10:15:04 +0100
commitedac1b36b572cbd8988c44341185a9f51ea3eeb5 (patch)
treec57aa56620e1ace3ec5eaa44a3e8412c6d70da46 /common
parentd2ee99e15f773306647696d45d69bfc5e358cd29 (diff)
Get rid of SW_CANVAS_IMAGE_CACHE
Every time it's used, it's in constructs similar to: #ifdef SW_CANVAS_CACHE , SpiceImageCache *bits_cache , SpicePaletteCache *palette_cache #elif defined(SW_CANVAS_IMAGE_CACHE) , SpiceImageCache *bits_cache #endif This can be rewritten as: , SpiceImageCache *bits_cache #ifdef SW_CANVAS_CACHE , SpicePaletteCache *palette_cache #endif allowing to get rid of SW_CANVAS_IMAGE_CACHE.
Diffstat (limited to 'common')
-rw-r--r--common/canvas_base.c4
-rw-r--r--common/gdi_canvas.c8
-rw-r--r--common/gl_canvas.c8
-rw-r--r--common/gl_canvas.h4
-rw-r--r--common/sw_canvas.c24
-rw-r--r--common/sw_canvas.h8
6 files changed, 14 insertions, 42 deletions
diff --git a/common/canvas_base.c b/common/canvas_base.c
index 400fba4..6f48340 100644
--- a/common/canvas_base.c
+++ b/common/canvas_base.c
@@ -3530,11 +3530,9 @@ inline static void canvas_base_init_ops(SpiceCanvasOps *ops)
static int canvas_base_init(CanvasBase *canvas, SpiceCanvasOps *ops,
int width, int height, uint32_t format
-#ifdef SW_CANVAS_CACHE
, SpiceImageCache *bits_cache
+#ifdef SW_CANVAS_CACHE
, SpicePaletteCache *palette_cache
-#elif defined(SW_CANVAS_IMAGE_CACHE)
- , SpiceImageCache *bits_cache
#endif
, SpiceImageSurfaces *surfaces
, SpiceGlzDecoder *glz_decoder
diff --git a/common/gdi_canvas.c b/common/gdi_canvas.c
index 3042031..3c434d6 100644
--- a/common/gdi_canvas.c
+++ b/common/gdi_canvas.c
@@ -1802,11 +1802,9 @@ static SpiceCanvasOps gdi_canvas_ops;
SpiceCanvas *gdi_canvas_create(int width, int height,
HDC dc, RecurciveMutex* lock, uint32_t format
-#ifdef SW_CANVAS_CACHE
, SpiceImageCache *bits_cache
+#ifdef SW_CANVAS_CACHE
, SpicePaletteCache *palette_cache
-#elif defined(SW_CANVAS_IMAGE_CACHE)
- , SpiceImageCache *bits_cache
#endif
, SpiceImageSurfaces *surfaces
, SpiceGlzDecoder *glz_decoder
@@ -1822,11 +1820,9 @@ SpiceCanvas *gdi_canvas_create(int width, int height,
canvas = spice_new0(GdiCanvas, 1);
canvas_base_init(&canvas->base, &gdi_canvas_ops,
width, height, format,
-#ifdef SW_CANVAS_CACHE
bits_cache,
+#ifdef SW_CANVAS_CACHE
palette_cache,
-#elif defined(SW_CANVAS_IMAGE_CACHE)
- bits_cache,
#endif
surfaces,
glz_decoder,
diff --git a/common/gl_canvas.c b/common/gl_canvas.c
index fe152ef..9c5b98c 100644
--- a/common/gl_canvas.c
+++ b/common/gl_canvas.c
@@ -813,11 +813,9 @@ static int need_init = 1;
static SpiceCanvasOps gl_canvas_ops;
SpiceCanvas *gl_canvas_create(int width, int height, uint32_t format
-#ifdef SW_CANVAS_CACHE
, SpiceImageCache *bits_cache
+#ifdef SW_CANVAS_CACHE
, SpicePaletteCache *palette_cache
-#elif defined(SW_CANVAS_IMAGE_CACHE)
- , SpiceImageCache *bits_cache
#endif
, SpiceImageSurfaces *surfaces
, SpiceGlzDecoder *glz_decoder
@@ -839,11 +837,9 @@ 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 SW_CANVAS_CACHE
, bits_cache
+#ifdef SW_CANVAS_CACHE
, palette_cache
-#elif defined(SW_CANVAS_IMAGE_CACHE)
- , bits_cache
#endif
, surfaces
, glz_decoder
diff --git a/common/gl_canvas.h b/common/gl_canvas.h
index 33b9fad..42c9e5a 100644
--- a/common/gl_canvas.h
+++ b/common/gl_canvas.h
@@ -28,11 +28,9 @@
SPICE_BEGIN_DECLS
SpiceCanvas *gl_canvas_create(int width, int height, uint32_t format
-#ifdef SW_CANVAS_CACHE
, SpiceImageCache *bits_cache
+#ifdef SW_CANVAS_CACHE
, SpicePaletteCache *palette_cache
-#elif defined(SW_CANVAS_IMAGE_CACHE)
- , SpiceImageCache *bits_cache
#endif
, SpiceImageSurfaces *surfaces
, SpiceGlzDecoder *glz_decoder
diff --git a/common/sw_canvas.c b/common/sw_canvas.c
index f947dde..7d67ca5 100644
--- a/common/sw_canvas.c
+++ b/common/sw_canvas.c
@@ -1193,11 +1193,9 @@ static SpiceCanvasOps sw_canvas_ops;
static SpiceCanvas *canvas_create_common(pixman_image_t *image,
uint32_t format
-#ifdef SW_CANVAS_CACHE
, SpiceImageCache *bits_cache
+#ifdef SW_CANVAS_CACHE
, SpicePaletteCache *palette_cache
-#elif defined(SW_CANVAS_IMAGE_CACHE)
- , SpiceImageCache *bits_cache
#endif
, SpiceImageSurfaces *surfaces
, SpiceGlzDecoder *glz_decoder
@@ -1218,11 +1216,9 @@ static SpiceCanvas *canvas_create_common(pixman_image_t *image,
pixman_image_get_width (image),
pixman_image_get_height (image),
format
-#ifdef SW_CANVAS_CACHE
, bits_cache
+#ifdef SW_CANVAS_CACHE
, palette_cache
-#elif defined(SW_CANVAS_IMAGE_CACHE)
- , bits_cache
#endif
, surfaces
, glz_decoder
@@ -1238,11 +1234,9 @@ static SpiceCanvas *canvas_create_common(pixman_image_t *image,
}
SpiceCanvas *canvas_create(int width, int height, uint32_t format
-#ifdef SW_CANVAS_CACHE
, SpiceImageCache *bits_cache
+#ifdef SW_CANVAS_CACHE
, SpicePaletteCache *palette_cache
-#elif defined(SW_CANVAS_IMAGE_CACHE)
- , SpiceImageCache *bits_cache
#endif
, SpiceImageSurfaces *surfaces
, SpiceGlzDecoder *glz_decoder
@@ -1256,11 +1250,9 @@ SpiceCanvas *canvas_create(int width, int height, uint32_t format
width, height, NULL, 0);
return canvas_create_common(image, format
-#ifdef SW_CANVAS_CACHE
, bits_cache
+#ifdef SW_CANVAS_CACHE
, palette_cache
-#elif defined(SW_CANVAS_IMAGE_CACHE)
- , bits_cache
#endif
, surfaces
, glz_decoder
@@ -1271,11 +1263,9 @@ SpiceCanvas *canvas_create(int width, int height, uint32_t format
SpiceCanvas *canvas_create_for_data(int width, int height, uint32_t format,
uint8_t *data, int stride
-#ifdef SW_CANVAS_CACHE
, SpiceImageCache *bits_cache
+#ifdef SW_CANVAS_CACHE
, SpicePaletteCache *palette_cache
-#elif defined(SW_CANVAS_IMAGE_CACHE)
- , SpiceImageCache *bits_cache
#endif
, SpiceImageSurfaces *surfaces
, SpiceGlzDecoder *glz_decoder
@@ -1289,11 +1279,9 @@ SpiceCanvas *canvas_create_for_data(int width, int height, uint32_t format,
width, height, (uint32_t *)data, stride);
return canvas_create_common(image, format
-#ifdef SW_CANVAS_CACHE
, bits_cache
+#ifdef SW_CANVAS_CACHE
, palette_cache
-#elif defined(SW_CANVAS_IMAGE_CACHE)
- , bits_cache
#endif
, surfaces
, glz_decoder
diff --git a/common/sw_canvas.h b/common/sw_canvas.h
index eb6c1f8..564d416 100644
--- a/common/sw_canvas.h
+++ b/common/sw_canvas.h
@@ -30,11 +30,9 @@
SPICE_BEGIN_DECLS
SpiceCanvas *canvas_create(int width, int height, uint32_t format
-#ifdef SW_CANVAS_CACHE
, SpiceImageCache *bits_cache
+#ifdef SW_CANVAS_CACHE
, SpicePaletteCache *palette_cache
-#elif defined(SW_CANVAS_IMAGE_CACHE)
- , SpiceImageCache *bits_cache
#endif
, SpiceImageSurfaces *surfaces
, SpiceGlzDecoder *glz_decoder
@@ -43,11 +41,9 @@ SpiceCanvas *canvas_create(int width, int height, uint32_t format
);
SpiceCanvas *canvas_create_for_data(int width, int height, uint32_t format, uint8_t *data, int stride
-#ifdef SW_CANVAS_CACHE
, SpiceImageCache *bits_cache
+#ifdef SW_CANVAS_CACHE
, SpicePaletteCache *palette_cache
-#elif defined(SW_CANVAS_IMAGE_CACHE)
- , SpiceImageCache *bits_cache
#endif
, SpiceImageSurfaces *surfaces
, SpiceGlzDecoder *glz_decoder
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-21 12:44:03 +0000