diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2010-06-23 14:46:23 +0200 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2010-06-29 12:30:20 +0200 |
| commit | e81c6ef7c4be264cf2c7497d2c927a4b7132590e (patch) | |
| tree | 7e0ea020a81857d7e7666832b8db4696a0975f18 /common | |
| parent | 63e07be145ae32bacef6f4229619a4d82a9b29cb (diff) | |
qxl abi: parse QXLCopy + QXLBlend.
Also adapt to tyops fix (s/rop_decriptor/rop_descriptor/).
Diffstat (limited to 'common')
| -rw-r--r-- | common/canvas_base.c | 4 | ||||
| -rw-r--r-- | common/gl_canvas.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/common/canvas_base.c b/common/canvas_base.c index debbd46..c5ab88a 100644 --- a/common/canvas_base.c +++ b/common/canvas_base.c @@ -2232,7 +2232,7 @@ static void canvas_draw_copy(SpiceCanvas *spice_canvas, SpiceRect *bbox, SpiceCl canvas_mask_pixman(canvas, &dest_region, ©->mask, bbox->left, bbox->top); - rop = ropd_descriptor_to_rop(copy->rop_decriptor, + rop = ropd_descriptor_to_rop(copy->rop_descriptor, ROP_INPUT_SRC, ROP_INPUT_DEST); @@ -2573,7 +2573,7 @@ static void canvas_draw_blend(SpiceCanvas *spice_canvas, SpiceRect *bbox, SpiceC canvas_mask_pixman(canvas, &dest_region, &blend->mask, bbox->left, bbox->top); - rop = ropd_descriptor_to_rop(blend->rop_decriptor, + rop = ropd_descriptor_to_rop(blend->rop_descriptor, ROP_INPUT_SRC, ROP_INPUT_DEST); diff --git a/common/gl_canvas.c b/common/gl_canvas.c index 1fe08ae..059bd04 100644 --- a/common/gl_canvas.c +++ b/common/gl_canvas.c @@ -364,7 +364,7 @@ static void gl_canvas_draw_copy(SpiceCanvas *spice_canvas, SpiceRect *bbox, Spic set_clip(canvas, bbox, clip); set_mask(canvas, ©->mask, bbox->left, bbox->top); - set_op(canvas, copy->rop_decriptor); + set_op(canvas, copy->rop_descriptor); //todo: optimize get_image (use ogl conversion + remove unnecessary copy of 32bpp) surface = canvas_get_image(&canvas->base, copy->src_bitmap, FALSE); @@ -438,7 +438,7 @@ static void gl_canvas_draw_blend(SpiceCanvas *spice_canvas, SpiceRect *bbox, Spi set_clip(canvas, bbox, clip); set_mask(canvas, &blend->mask, bbox->left, bbox->top); - set_op(canvas, blend->rop_decriptor); + set_op(canvas, blend->rop_descriptor); surface = canvas_get_image(&canvas->base, blend->src_bitmap, FALSE); SET_GLC_RECT(&dest, bbox); |