summaryrefslogtreecommitdiffstats
path: root/common/gl_canvas.c
diff options
context:
space:
mode:
authorAlexander Larsson <alexl@redhat.com>2010-03-03 16:43:36 +0100
committerAlexander Larsson <alexl@redhat.com>2010-03-08 19:45:28 +0100
commit18606d99eaf11dbceb79dc24f0a41e85345db300 (patch)
tree2bd69130cc798cdcee43443fb6eae14b94a5b88c /common/gl_canvas.c
parentf8217d8b96f35fd297c74df1da6428b56b01149a (diff)
downloadspice-18606d99eaf11dbceb79dc24f0a41e85345db300.tar.gz
spice-18606d99eaf11dbceb79dc24f0a41e85345db300.tar.xz
spice-18606d99eaf11dbceb79dc24f0a41e85345db300.zip
Move canvas_region and group_start/end to canvas_base
Diffstat (limited to 'common/gl_canvas.c')
-rw-r--r--common/gl_canvas.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/common/gl_canvas.c b/common/gl_canvas.c
index 99f14f5d..c3c93880 100644
--- a/common/gl_canvas.c
+++ b/common/gl_canvas.c
@@ -738,6 +738,8 @@ static void gl_canvas_group_start(SpiceCanvas *spice_canvas, QRegion *region)
int num_rect;
pixman_box32_t *rects;
+ canvas_base_group_start(spice_canvas, region);
+
rects = pixman_region32_rectangles(region, &num_rect);
glc_rects = (GLCRect *)malloc(num_rect * sizeof(GLCRect));
@@ -803,6 +805,8 @@ static void gl_canvas_put_image(SpiceCanvas *spice_canvas, const SpiceRect *dest
static void gl_canvas_group_end(SpiceCanvas *spice_canvas)
{
GLCanvas *canvas = (GLCanvas *)spice_canvas;
+
+ canvas_base_group_end(spice_canvas);
glc_clear_mask(canvas->glc, GLC_MASK_B);
}
@@ -842,7 +846,8 @@ SpiceCanvas *gl_canvas_create(int width, int height, int depth
goto error_1;
}
canvas->private_data = NULL;
- init_ok = canvas_base_init(&canvas->base, &gl_canvas_ops, depth
+ init_ok = canvas_base_init(&canvas->base, &gl_canvas_ops,
+ width, height, depth
#ifdef CAIRO_CANVAS_CACHE
, bits_cache
, palette_cache