diff options
| author | Alexander Larsson <alexl@redhat.com> | 2010-04-19 16:19:43 +0200 |
|---|---|---|
| committer | Alexander Larsson <alexl@redhat.com> | 2010-04-23 16:36:35 +0200 |
| commit | 98d91203c5d2f6f7249f38941466857b6a566f5d (patch) | |
| tree | cdc2b54152f0be3d668ed49b903a35886fcc1c99 /common/gl_canvas.c | |
| parent | 619c37af17406f77c7cb76f3b72bbfc268383d91 (diff) | |
| download | spice-98d91203c5d2f6f7249f38941466857b6a566f5d.tar.gz spice-98d91203c5d2f6f7249f38941466857b6a566f5d.tar.xz spice-98d91203c5d2f6f7249f38941466857b6a566f5d.zip | |
Make client canvas and pixmaps handle more formats and simplify
We now support 16bit format pixmaps as well as the old ones. Including
both 555 and 565 modes.
We drop the palette argument for pixmap construction as it was only
used for black/white anyway.
Canvas creation is simplified so that there is no separate set_mode
state. Canvases are already created in the right mode and never change.
Diffstat (limited to 'common/gl_canvas.c')
| -rw-r--r-- | common/gl_canvas.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common/gl_canvas.c b/common/gl_canvas.c index dd470bc5..9b017fa2 100644 --- a/common/gl_canvas.c +++ b/common/gl_canvas.c @@ -821,7 +821,7 @@ static void gl_canvas_set_access_params(SpiceCanvas *spice_canvas, unsigned long static int need_init = 1; static SpiceCanvasOps gl_canvas_ops; -SpiceCanvas *gl_canvas_create(int width, int height, int depth +SpiceCanvas *gl_canvas_create(int width, int height, uint32_t format #ifdef CAIRO_CANVAS_CACHE , SpiceImageCache *bits_cache , SpicePaletteCache *palette_cache @@ -848,7 +848,7 @@ SpiceCanvas *gl_canvas_create(int width, int height, int depth } canvas->private_data = NULL; init_ok = canvas_base_init(&canvas->base, &gl_canvas_ops, - width, height, depth + width, height, format #ifdef CAIRO_CANVAS_CACHE , bits_cache , palette_cache |