From 7b7f71a7d522f430e09f02d71eca24474408dc55 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Wed, 7 Jan 2015 10:41:26 +0000 Subject: sna/video: Reuse fallback colorkey filler from overlay for sprites Signed-off-by: Chris Wilson --- src/sna/sna_video_overlay.c | 70 +-------------------------------------------- 1 file changed, 1 insertion(+), 69 deletions(-) (limited to 'src/sna/sna_video_overlay.c') diff --git a/src/sna/sna_video_overlay.c b/src/sna/sna_video_overlay.c index ee986fe3..aee6d479 100644 --- a/src/sna/sna_video_overlay.c +++ b/src/sna/sna_video_overlay.c @@ -449,70 +449,6 @@ sna_video_overlay_show(struct sna *sna, return true; } -static bool fill_colorkey(struct sna_video *video, const RegionRec *clip) -{ - struct sna *sna = video->sna; - PixmapPtr front = sna->front; - struct kgem_bo *bo = __sna_pixmap_get_bo(front); - uint8_t *dst, *tmp; - int w, width; - bool ret; - - assert(bo); - - if (!wedged(sna) && - sna_blt_fill_boxes(sna, GXcopy, bo, - front->drawable.bitsPerPixel, - video->color_key, - region_rects(clip), - region_num_rects(clip))) - return true; - - dst = kgem_bo_map__gtt(&sna->kgem, bo); - if (dst == NULL) - return false; - - w = front->drawable.bitsPerPixel/8; - width = (clip->extents.x2 - clip->extents.x1) * w; - tmp = malloc(width); - if (tmp == NULL) - return false; - - memcpy(tmp, &video->color_key, w); - while (2 * w < width) { - memcpy(tmp + w, tmp, w); - w *= 2; - } - if (w < width) - memcpy(tmp + w, tmp, width - w); - - ret = false; - if (sigtrap_get() == 0) { - const BoxRec *box = region_rects(clip); - int n = region_num_rects(clip); - - w = front->drawable.bitsPerPixel/8; - do { - int y = box->y1; - uint8_t *row = dst + y*bo->pitch + w*box->x1; - - width = (box->x2 - box->x1) * w; - while (y < box->y2) { - memcpy(row, tmp, width); - row += bo->pitch; - y++; - } - box++; - } while (--n); - sigtrap_put(); - - ret = true; - } - - free(tmp); - return ret; -} - static int sna_video_overlay_put_image(ddPutImage_ARGS) { @@ -615,11 +551,7 @@ sna_video_overlay_put_image(ddPutImage_ARGS) ret = Success; if (sna_video_overlay_show (sna, video, &frame, crtc, &dstBox, src_w, src_h, drw_w, drw_h)) { - //xf86XVFillKeyHelperDrawable(draw, video->color_key, &clip); - if (!video->AlwaysOnTop && - !RegionEqual(&video->clip, &clip) && - fill_colorkey(video, &clip)) - RegionCopy(&video->clip, &clip); + sna_video_fill_colorkey(video, &clip); sna_window_set_port((WindowPtr)draw, port); } else { DBG(("%s: failed to show video frame\n", __FUNCTION__)); -- cgit v1.2.3