qxl abi: parse QXLCopy + QXLBlend.

Also adapt to tyops fix (s/rop_decriptor/rop_descriptor/).
This commit is contained in:
Gerd Hoffmann 2010-06-23 14:46:23 +02:00 committed by Marc-André Lureau
parent 6ba331f45e
commit 908c841563
4 changed files with 8 additions and 8 deletions

View File

@ -2232,7 +2232,7 @@ static void canvas_draw_copy(SpiceCanvas *spice_canvas, SpiceRect *bbox, SpiceCl
canvas_mask_pixman(canvas, &dest_region, &copy->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);

View File

@ -364,7 +364,7 @@ static void gl_canvas_draw_copy(SpiceCanvas *spice_canvas, SpiceRect *bbox, Spic
set_clip(canvas, bbox, clip);
set_mask(canvas, &copy->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);

View File

@ -673,7 +673,7 @@ channel DisplayChannel : BaseChannel {
struct Copy {
Image *src_bitmap;
Rect src_area;
ropd rop_decriptor;
ropd rop_descriptor;
image_scale_mode scale_mode;
QMask mask @outvar(mask);
} data;
@ -684,7 +684,7 @@ channel DisplayChannel : BaseChannel {
struct Blend {
Image *src_bitmap;
Rect src_area;
ropd rop_decriptor;
ropd rop_descriptor;
image_scale_mode scale_mode;
QMask mask @outvar(mask);
} @ctype(SpiceCopy) data;

View File

@ -622,7 +622,7 @@ channel DisplayChannel : BaseChannel {
struct Copy {
Image *src_bitmap;
Rect src_area;
ropd rop_decriptor;
ropd rop_descriptor;
image_scale_mode scale_mode;
QMask mask @outvar(mask);
} data;
@ -633,7 +633,7 @@ channel DisplayChannel : BaseChannel {
struct Blend {
Image *src_bitmap;
Rect src_area;
ropd rop_decriptor;
ropd rop_descriptor;
image_scale_mode scale_mode;
QMask mask @outvar(mask);
} @ctype(SpiceCopy) data;