diff options
Diffstat (limited to 'src/qxl_surface.c')
-rw-r--r-- | src/qxl_surface.c | 201 |
1 files changed, 198 insertions, 3 deletions
diff --git a/src/qxl_surface.c b/src/qxl_surface.c index 0169350..e88675f 100644 --- a/src/qxl_surface.c +++ b/src/qxl_surface.c @@ -89,6 +89,17 @@ struct qxl_surface_t { qxl_surface_t *copy_src; Pixel solid_pixel; + + struct + { + int op; + PicturePtr src_picture; + PicturePtr mask_picture; + PicturePtr dest_picture; + qxl_surface_t *src; + qxl_surface_t *mask; + qxl_surface_t *dest; + } composite; } u; }; @@ -302,7 +313,7 @@ get_formats (int bpp, SpiceBitmapFmt *format, pixman_format_code_t *pformat) break; } } - + static qxl_surface_t * surface_get_from_cache (surface_cache_t *cache, int width, int height, int bpp) { @@ -674,7 +685,8 @@ retry: push_surface_cmd (cache, cmd); - dev_addr = (uint32_t *)((uint8_t *)surface->address + stride * (height - 1)); + dev_addr + = (uint32_t *)((uint8_t *)surface->address + stride * (height - 1)); surface->dev_image = pixman_image_create_bits ( pformat, width, height, dev_addr, - stride); @@ -735,7 +747,7 @@ qxl_surface_create (surface_cache_t * cache, if (!(surface = surface_get_from_cache (cache, width, height, bpp))) if (!(surface = surface_send_create (cache, width, height, bpp))) return NULL; - + surface->next = cache->live_surfaces; surface->prev = NULL; if (cache->live_surfaces) @@ -1367,6 +1379,189 @@ qxl_surface_copy (qxl_surface_t *dest, push_drawable (qxl, drawable); } +/* composite */ +Bool +qxl_surface_prepare_composite (int op, + PicturePtr src_picture, + PicturePtr mask_picture, + PicturePtr dest_picture, + qxl_surface_t * src, + qxl_surface_t * mask, + qxl_surface_t * dest) +{ + dest->u.composite.op = op; + dest->u.composite.src_picture = src_picture; + dest->u.composite.mask_picture = mask_picture; + dest->u.composite.dest_picture = dest_picture; + dest->u.composite.src = src; + dest->u.composite.mask = mask; + dest->u.composite.dest = dest; + + return TRUE; +} + +static QXLImage * +image_from_picture (qxl_screen_t *qxl, + PicturePtr picture, + qxl_surface_t *surface, + int *force_opaque) +{ + struct QXLImage *image = qxl_allocnf (qxl, sizeof *image, "image struct for picture"); + + image->descriptor.id = 0; + image->descriptor.type = SPICE_IMAGE_TYPE_SURFACE; + image->descriptor.width = 0; + image->descriptor.height = 0; + image->surface_image.surface_id = surface->id; + + if (picture->format == PICT_x8r8g8b8) + *force_opaque = TRUE; + else + *force_opaque = FALSE; + + return image; +} + +static QXLTransform * +get_transform (qxl_screen_t *qxl, PictTransform *transform) +{ + if (transform) + { + QXLTransform *qxform = qxl_allocnf (qxl, sizeof (QXLTransform), "transform"); + + qxform->t00 = transform->matrix[0][0]; + qxform->t01 = transform->matrix[0][1]; + qxform->t02 = transform->matrix[0][2]; + qxform->t10 = transform->matrix[1][0]; + qxform->t11 = transform->matrix[1][1]; + qxform->t12 = transform->matrix[1][2]; + + return qxform; + } + else + { + return NULL; + } +} + +static QXLRect +full_rect (qxl_surface_t *surface) +{ + QXLRect r; + int w = pixman_image_get_width (surface->host_image); + int h = pixman_image_get_height (surface->host_image); + + r.left = r.top = 0; + r.right = w; + r.bottom = h; + + return r; +} + +void +qxl_surface_composite (qxl_surface_t *dest, + int src_x, int src_y, + int mask_x, int mask_y, + int dest_x, int dest_y, + int width, int height) +{ + qxl_screen_t *qxl = dest->cache->qxl; + PicturePtr src = dest->u.composite.src_picture; + qxl_surface_t *qsrc = dest->u.composite.src; + PicturePtr mask = dest->u.composite.mask_picture; + qxl_surface_t *qmask = dest->u.composite.mask; + int op = dest->u.composite.op; + struct QXLDrawable *drawable; + QXLComposite *composite; + QXLRect rect; + QXLImage *img; + QXLTransform *trans; + int n_deps = 0; + int force_opaque; + +#if 0 + ErrorF ("QXL Composite: src: %x (%d %d) id: %d; \n" + " mask: id: %d\n" + " dest: %x %d %d %d %d (id: %d)\n", + dest->u.composite.src_picture->format, + dest->u.composite.src_picture->pDrawable->width, + dest->u.composite.src_picture->pDrawable->height, + dest->u.composite.src->id, + dest->u.composite.mask? dest->u.composite.mask->id : -1, + dest->u.composite.dest_picture->format, + dest_x, dest_y, width, height, + dest->id + ); +#endif + + rect.left = dest_x; + rect.right = dest_x + width; + rect.top = dest_y; + rect.bottom = dest_y + height; + + drawable = make_drawable (qxl, dest->id, QXL_DRAW_COMPOSITE, &rect); + + composite = &drawable->u.composite; + + composite->flags = 0; + + if (dest->u.composite.dest_picture->format == PICT_x8r8g8b8) + composite->flags |= SPICE_COMPOSITE_DEST_OPAQUE; + + composite->flags |= (op & 0xff); + + img = image_from_picture (qxl, src, qsrc, &force_opaque); + if (force_opaque) + composite->flags |= SPICE_COMPOSITE_SOURCE_OPAQUE; + composite->src = physical_address (qxl, img, qxl->main_mem_slot); + composite->flags |= (src->filter << 8); + composite->flags |= (src->repeat << 14); + trans = get_transform (qxl, src->transform); + composite->src_transform = trans? + physical_address (qxl, trans, qxl->main_mem_slot) : 0x00000000; + + drawable->surfaces_dest[n_deps] = qsrc->id; + drawable->surfaces_rects[n_deps] = full_rect (qsrc); + + n_deps++; + + if (mask) + { + img = image_from_picture (qxl, mask, qmask, &force_opaque); + if (force_opaque) + composite->flags |= SPICE_COMPOSITE_MASK_OPAQUE; + composite->mask = physical_address (qxl, img, qxl->main_mem_slot); + composite->flags |= (mask->filter << 11); + composite->flags |= (mask->repeat << 16); + composite->flags |= (mask->componentAlpha << 18); + + drawable->surfaces_dest[n_deps] = qmask->id; + drawable->surfaces_rects[n_deps] = full_rect (qmask); + n_deps++; + + trans = get_transform (qxl, src->transform); + composite->mask_transform = trans? + physical_address (qxl, trans, qxl->main_mem_slot) : 0x00000000; + } + else + { + composite->mask = 0x00000000; + composite->mask_transform = 0x00000000; + } + + drawable->surfaces_dest[n_deps] = dest->id; + drawable->surfaces_rects[n_deps] = full_rect (dest); + + composite->src_origin.x = src_x; + composite->src_origin.y = src_y; + composite->mask_origin.x = mask_x; + composite->mask_origin.y = mask_y; + + drawable->effect = QXL_EFFECT_BLEND; + + push_drawable (qxl, drawable); +} + Bool qxl_surface_put_image (qxl_surface_t *dest, int x, int y, int width, int height, |