Aurelien
/
xf86-video-intel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

uxa: enable solid rects for backends that require pixmaps 

Convert the color into a (cached) pixmap if the backend cannot handle
the SolidFill natively.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2010-05-14 20:52:48 +01:00
parent a21297d7cc
commit b9a5e36f95
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
uxa/uxa-render.c
View File

@ -860,7 +860,7 @@ uxa_solid_rects (CARD8 op,
{
ScreenPtr screen = dst->pDrawable->pScreen;
uxa_screen_t *uxa_screen = uxa_get_screen(screen);
PixmapPtr pixmap;
PixmapPtr pixmap, src_pixmap = NULL;
int dst_x, dst_y;
PicturePtr src;
int error;
@ -872,17 +872,12 @@ uxa_solid_rects (CARD8 op,
if (dst->alphaMap)
goto fallback;
if (!uxa_screen->info->check_composite_texture)
goto fallback;
pixmap = uxa_get_offscreen_pixmap(dst->pDrawable, &dst_x, &dst_y);
if (!pixmap)
goto fallback;
if (op == PictOpClear)
color->red = color->green = color->blue = color->alpha = 0;
if (PICT_FORMAT_A(dst->format) == 0)
color->alpha = 0xffff;
if (color->alpha >= 0xff00 && op == PictOpOver)
op = PictOpSrc;
@ -890,16 +885,26 @@ uxa_solid_rects (CARD8 op,
if (!src)
goto fallback;
if (!uxa_screen->info->check_composite(op, src, NULL, dst) ||
if (!uxa_screen->info->check_composite(op, src, NULL, dst))
goto err_src;
if (!uxa_screen->info->check_composite_texture ||
!uxa_screen->info->check_composite_texture(screen, src)) {
PicturePtr solid;
int src_off_x, src_off_y;
solid = uxa_acquire_solid(screen, src->pSourcePict);
FreePicture(src, 0);
goto fallback;
src = solid;
src_pixmap = uxa_get_offscreen_pixmap(src->pDrawable,
&src_off_x, &src_off_y);
if (!src_pixmap)
goto err_src;
}
if (!uxa_screen->info->prepare_composite(op, src, NULL, dst, NULL, NULL, pixmap)) {
FreePicture(src, 0);
goto fallback;
}
if (!uxa_screen->info->prepare_composite(op, src, NULL, dst, src_pixmap, NULL, pixmap))
goto err_src;
while (num_rects--) {
uxa_screen->info->composite(pixmap,
@ -916,6 +921,8 @@ uxa_solid_rects (CARD8 op,
return;
err_src:
FreePicture(src, 0);
fallback:
uxa_screen->SavedCompositeRects(op, dst, color, num_rects, rects);
}