diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2010-06-23 09:49:35 +0200 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2010-06-29 12:30:19 +0200 |
| commit | 08cfd6beaff1bfd59c5883b4d07a964eb8644595 (patch) | |
| tree | ad8d5dca39a5a24b09b2535190bff0cd05dbb97c /common | |
| parent | ef3e20e29ff124eeb10729c0d512b1d231276394 (diff) | |
| download | spice-08cfd6beaff1bfd59c5883b4d07a964eb8644595.tar.gz spice-08cfd6beaff1bfd59c5883b4d07a964eb8644595.tar.xz spice-08cfd6beaff1bfd59c5883b4d07a964eb8644595.zip | |
qxl abi: parse QXLOpaque.
Also adapt to tyops fix (s/rop_decriptor/rop_descriptor/).
Diffstat (limited to 'common')
| -rw-r--r-- | common/canvas_base.c | 2 | ||||
| -rw-r--r-- | common/gl_canvas.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/common/canvas_base.c b/common/canvas_base.c index 68ea1a67..debbd461 100644 --- a/common/canvas_base.c +++ b/common/canvas_base.c @@ -2518,7 +2518,7 @@ static void canvas_draw_opaque(SpiceCanvas *spice_canvas, SpiceRect *bbox, Spice canvas_mask_pixman(canvas, &dest_region, &opaque->mask, bbox->left, bbox->top); - rop = ropd_descriptor_to_rop(opaque->rop_decriptor, + rop = ropd_descriptor_to_rop(opaque->rop_descriptor, ROP_INPUT_BRUSH, ROP_INPUT_SRC); diff --git a/common/gl_canvas.c b/common/gl_canvas.c index 2773edab..1fe08aee 100644 --- a/common/gl_canvas.c +++ b/common/gl_canvas.c @@ -389,7 +389,7 @@ static void gl_canvas_draw_opaque(SpiceCanvas *spice_canvas, SpiceRect *bbox, Sp set_clip(canvas, bbox, clip); set_mask(canvas, &opaque->mask, bbox->left, bbox->top); - glc_set_op(canvas->glc, (opaque->rop_decriptor & SPICE_ROPD_INVERS_SRC) ? GLC_OP_COPY_INVERTED : + glc_set_op(canvas->glc, (opaque->rop_descriptor & SPICE_ROPD_INVERS_SRC) ? GLC_OP_COPY_INVERTED : GLC_OP_COPY); surface = canvas_get_image(&canvas->base, opaque->src_bitmap, FALSE); surface_to_image(canvas, surface, &image, 0); @@ -399,7 +399,7 @@ static void gl_canvas_draw_opaque(SpiceCanvas *spice_canvas, SpiceRect *bbox, Sp pixman_image_unref(surface); set_brush(canvas, &opaque->brush); - set_op(canvas, opaque->rop_decriptor & ~SPICE_ROPD_INVERS_SRC); + set_op(canvas, opaque->rop_descriptor & ~SPICE_ROPD_INVERS_SRC); SET_GLC_RECT(&fill_rect, bbox); glc_fill_rect(canvas->glc, &fill_rect); |