summaryrefslogtreecommitdiff
path: root/common/gl_canvas.c
diff options
context:
space:
mode:
authorIzik Eidus <ieidus@redhat.com>2009-11-21 22:42:38 +0200
committerMarc-André Lureau <marcandre.lureau@gmail.com>2012-03-20 15:25:36 +0100
commit8d3823c46a88f69b34f9db20aea8ab8f8aae7e63 (patch)
tree7399158c03e6b1b1dc50808de900b7bf938cd801 /common/gl_canvas.c
parentee15aef4bca80195f00e5b9f96c4b59c6d2bb0cf (diff)
spice: server: add memslots support.
Signed-off-by: Izik Eidus <ieidus@redhat.com>
Diffstat (limited to 'common/gl_canvas.c')
-rw-r--r--common/gl_canvas.c24
1 files changed, 14 insertions, 10 deletions
diff --git a/common/gl_canvas.c b/common/gl_canvas.c
index aac93c9..73c3c51 100644
--- a/common/gl_canvas.c
+++ b/common/gl_canvas.c
@@ -770,16 +770,9 @@ void gl_canvas_clear_top_mask(GLCanvas *canvas)
}
#ifdef CAIRO_CANVAS_ACCESS_TEST
-void gl_canvas_set_access_params(GLCanvas *canvas, ADDRESS delta, unsigned long base,
- unsigned long max)
+void gl_canvas_set_access_params(GLCanvas *canvas, unsigned long base, unsigned long max)
{
- __canvas_set_access_params(&canvas->base, delta, base, max);
-}
-
-#else
-void gl_canvas_set_access_params(GLCanvas *canvas, ADDRESS delta)
-{
- __canvas_set_access_params(&canvas->base, delta);
+ __canvas_set_access_params(&canvas->base, base, max);
}
#endif
@@ -811,6 +804,10 @@ GLCanvas *gl_canvas_create(void *usr_data, int width, int height, int depth
#ifdef USE_GLZ
, void *glz_decoder_opaque, glz_decode_fn_t glz_decode
#endif
+#ifndef CAIRO_CANVAS_NO_CHUNKS
+ , void *get_virt_opaque, get_virt_fn_t get_virt,
+ void *validate_virt_opaque, validate_virt_fn_t validate_virt
+#endif
)
{
GLCanvas *canvas;
@@ -848,6 +845,13 @@ GLCanvas *gl_canvas_create(void *usr_data, int width, int height, int depth
glz_decoder_opaque,
glz_decode
#endif
+#ifndef CAIRO_CANVAS_NO_CHUNKS
+ ,
+ get_virt_opaque,
+ get_virt,
+ validate_virt_opaque,
+ validate_virt
+#endif
);
if (!init_ok) {
goto error_2;
@@ -882,5 +886,5 @@ void gl_canvas_init() //unsafe global function
return;
}
need_init = 0;
- rop3_init();
+ rop3_init();
}